1N/A

1N/A

1N/A

1N/Aimport cStringIO

1N/Aimport os

1N/Afrom mercurial import hg, patch, cmdutil, util, node, repo

1N/Afrom mercurial import revlog, repair

1N/Afrom hgext import mq

1N/A

1N/Afrom onbld.Scm import Version

1N/A

1N/A

1N/Aclass ActiveEntry(object):

1N/A '''Representation of the changes made to a single file.

1N/A

1N/A MODIFIED = 1

1N/A ADDED = 2

1N/A REMOVED = 3

1N/A

1N/A def __init__(self, name):

1N/A self.name = name

1N/A self.change = None

1N/A self.parentname = None

1N/A # As opposed to copied (or neither)

1N/A self.renamed = False

1N/A self.comments = []

1N/A

1N/A #

1N/A # ActiveEntrys sort by the name of the file they represent.

1N/A #

1N/A def __cmp__(self, other):

1N/A return cmp(self.name, other.name)

1N/A

1N/A def is_added(self):

1N/A return self.change == self.ADDED

1N/A

def is_modified(self):

return self.change == self.MODIFIED

def is_removed(self):

return self.change == self.REMOVED

def is_renamed(self):

return self.parentname and self.renamed

def is_copied(self):

return self.parentname and not self.renamed

class ActiveList(object):

'''Complete representation of workspace change.

def __init__(self, ws, parenttip, revs=None):

self._active = {}

self.ws = ws

self.revs = revs

self.base = None

self.parenttip = parenttip

#

# If we couldn't find a parenttip, the two repositories must

# be unrelated (Hg catches most of this, but this case is valid for it

# but invalid for us)

#

if self.parenttip == None:

raise util.Abort('repository is unrelated')

self.localtip = None

if revs:

self.base = revs[0]

self.localtip = revs[-1]

self._comments = []

self._build(revs)

def _build(self, revs):

if not revs:

return

status = self.ws.status(self.parenttip.node(), self.localtip.node())

files = []

for ctype in status.values():

files.extend(ctype)

#

# When a file is renamed, two operations actually occur.

# A file copy from source to dest and a removal of source.

#

# These are represented as two distinct entries in the

# changectx and status (one on the dest file for the

# copy, one on the source file for the remove).

#

# Since these are unconnected in both the context and

# status we can only make the association by explicitly

# looking for it.

#

# We deal with this thusly:

#

# We maintain a dict dest -> source of all copies

# (updating dest as appropriate, but leaving source alone).

#

# After all other processing, we mark as renamed any pair

# where source is on the removed list.

#

copies = {}

#

# Walk revs looking for renames and adding files that

# are in both change context and status to the active

# list.

#

for ctx in revs:

desc = ctx.description().splitlines()

self._comments.extend(desc)

for fname in ctx.files():

#

# We store comments per-entry as well, for the sake of

# webrev and similar. We store twice to avoid the problems

# of uniquifying comments for the general list (and possibly

# destroying multi-line entities in the process).

#

if fname not in self:

self._addentry(fname)

self[fname].comments.extend(desc)

try:

fctx = ctx.filectx(fname)

except revlog.LookupError:

continue

#

# NB: .renamed() is a misnomer, this actually checks

# for copies.

#

rn = fctx.renamed()

if rn:

#

# If the source file is a known copy we know its

# ancestry leads us to the parent.

# Otherwise make sure the source file is known to

# be in the parent, we need not care otherwise.

#

# We detect cycles at a later point. There is no

# reason to continuously handle them.

#

if rn[0] in copies:

copies[fname] = copies[rn[0]]

elif rn[0] in self.parenttip.manifest():

copies[fname] = rn[0]

#

# Walk the copy list marking as copied any non-cyclic pair

# where the destination file is still present in the local

# tip (to avoid ephemeral changes)

#

# Where source is removed, mark as renamed, and remove the

# AL entry for the source file

#

for fname, oldname in copies.iteritems():

if fname == oldname or fname not in self.localtip.manifest():

continue

self[fname].parentname = oldname

if oldname in status['removed']:

self[fname].renamed = True

if oldname in self:

del self[oldname]

#

# Walk the active list setting the change type for each active

# file.

#

# In the case of modified files that are not renames or

# copies, we do a content comparison, and drop entries that

# are not actually modified.

#

# We walk a copy of the AL such that we can drop entries

# within the loop.

#

for entry in self._active.values():

if entry.name not in files:

del self[entry.name]

continue

if entry.name in status['added']:

entry.change = ActiveEntry.ADDED

elif entry.name in status['removed']:

entry.change = ActiveEntry.REMOVED

elif entry.name in status['modified']:

entry.change = ActiveEntry.MODIFIED

#

# There are cases during a merge where a file will be in

# the status return as modified, but in reality be an

# addition (ie, not in the parenttip).

#

# We need to check whether the file is actually present

# in the parenttip, and set it as an add, if not.

#

if entry.name not in self.parenttip.manifest():

entry.change = ActiveEntry.ADDED

elif entry.is_modified() and not entry.parentname:

if not self.filecmp(entry):

del self[entry.name]

continue

assert entry.change

def __contains__(self, fname):

return fname in self._active

def __getitem__(self, key):

return self._active[key]

def __setitem__(self, key, value):

self._active[key] = value

def __delitem__(self, key):

del self._active[key]

def __iter__(self):

for entry in self._active.values():

yield entry

def _addentry(self, fname):

if fname not in self:

self[fname] = ActiveEntry(fname)

#

# Return list of files represented in this AL,

# including the parent file of a rename

#

def files(self):

ret = self._active.keys()

ret.extend([x.parentname for x in self

if x.parentname and x.parentname not in ret])

return ret

def comments(self):

return self._comments

#

# It's not uncommon for a child workspace to itself contain the

# merge of several other children, with initial branch points in

# the parent (possibly from the cset a project gate was created

# from, for instance).

#

# Immediately after recommit, this leaves us looking like this:

#

# * <- recommitted changeset (real tip)

# |

# | * <- Local tip

# |/|

# * | <- parent tip

# | |\

# | | |

# | | |\

# | | | |

# | * | | <- Base

# |/_/__/

#

# [left-most is parent, next is child, right two being

# branches in child, intermediate merges parent->child

# omitted]

#

# Obviously stripping base (the first child-specific delta on the

# main child workspace line) doesn't remove the vestigial branches

# from other workspaces (or in-workspace branches, or whatever)

#

# In reality, what we need to strip in a recommit is any

# child-specific branch descended from the parent (rather than

# another part of the child). Note that this by its very nature

# includes the branch representing the 'main' child workspace.

#

# We calculate these by walking from base (which is guaranteed to

# be the oldest child-local cset) to localtip searching for

# changesets with only one parent cset, and where that cset is not

# part of the active list (and is therefore outgoing).

#

def bases(self):

'''Find the bases that in combination define the "old"

get = util.cachefunc(lambda r: self.ws.repo.changectx(r).changeset())

# We don't rebuild the AL So the AL local tip is the old tip

revrange = "%s:%s" % (self.base.rev(), self.localtip.rev())

changeiter = cmdutil.walkchangerevs(self.ws.repo.ui, self.ws.repo,

[], get, {'rev': [revrange]})[0]

hold = []

ret = []

alrevs = [x.rev() for x in self.revs]

for st, rev, fns in changeiter:

n = self.ws.repo.changelog.node(rev)

if st == 'add':

if rev in alrevs:

hold.append(n)

elif st == 'iter':

if n not in hold:

continue

p = self.ws.repo.changelog.parents(n)

if p[1] != node.nullid:

continue

if self.ws.repo.changectx(p[0]).rev() not in alrevs:

ret.append(n)

return ret

def tags(self):

'''Find tags that refer to a changeset in the ActiveList,

if os.path.exists(self.ws.repo.join('localtags')):

l = self.ws.repo.opener('localtags').readlines()

ltags = [x.rstrip().split(' ', 1) for x in l]

else:

ltags = []

# We want to use the tags file from the localtip

if '.hgtags' in self.localtip.manifest():

f = self.localtip.filectx('.hgtags')

rtags = [x.rstrip().split(' ', 1) for x in f.data().splitlines()]

else:

rtags = []

nodes = [node.hex(n.node()) for n in self.revs]

tags = []

for nd, name in rtags:

if nd in nodes:

tags.append((name, self.ws.repo.lookup(nd), False))

for nd, name in ltags:

if nd in nodes:

tags.append((name, self.ws.repo.lookup(nd), True))

return tags

def filecmp(self, entry):

'''Compare two revisions of two files

parentfile = self.parenttip.filectx(entry.parentname or entry.name)

localfile = self.localtip.filectx(entry.name)

#

# NB: Keep these ordered such as to make every attempt

# to short-circuit the more time consuming checks.

#

if parentfile.size() != localfile.size():

return True

if self.ws.flags(parentfile) != self.ws.flags(localfile):

return True

if parentfile.cmp(localfile.data()):

return True

class WorkSpace(object):

def __init__(self, repository):

self.repo = repository

self.ui = self.repo.ui

self.name = self.repo.root

self.activecache = {}

self.outgoingcache = {}

def parent(self, spec=None):

'''Return the canonical workspace parent, either SPEC (which

if spec:

return self.ui.expandpath(spec)

p = self.ui.expandpath('default')

if p == 'default':

return None

else:

return p

def _localtip(self, outgoing, wctx):

'''Return the most representative changeset to act as the

#

# A modified working copy is seen as a proto-branch, and thus

# our only option as the local tip.

#

if (wctx.files() or len(wctx.parents()) > 1 or

wctx.branch() != wctx.parents()[0].branch()):

return wctx

heads = self.repo.heads(start=wctx.parents()[0].node())

headctxs = [self.repo.changectx(n) for n in heads]

localctxs = [c for c in headctxs if c.node() in outgoing]

ltip = sorted(localctxs or headctxs, key=lambda x: x.rev())[-1]

if len(heads) > 1:

self.ui.warn('The current branch has more than one head, '

'using %s\n' % ltip.rev())

return ltip

def _parenttip(self, heads, outgoing):

'''Return the highest-numbered, non-outgoing changeset that is

def tipmost_shared(head, outnodes):

'''Return the tipmost node on the same branch as head that is not

opts = {'rev': ['%s:0' % head.rev()],

'follow': True}

get = util.cachefunc(lambda r: self.repo.changectx(r).changeset())

changeiter = cmdutil.walkchangerevs(self.repo.ui, self.repo, [],

get, opts)[0]

seen = []

for st, rev, fns in changeiter:

n = self.repo.changelog.node(rev)

if st == 'add':

if n not in outnodes:

seen.append(n)

elif st == 'iter':

if n in seen:

return rev

return self.repo.changelog.rev(node.nullid)

nodes = set(outgoing)

ptips = map(lambda x: tipmost_shared(x, nodes), heads)

return self.repo.changectx(sorted(ptips)[-1])

def status(self, base=None, head=None):

'''Translate from the hg 6-tuple status format to a hash keyed

states = ['modified', 'added', 'removed', 'deleted', 'unknown',

'ignored']

if base is None and Version.at_least("1.1"):

base = '.'

chngs = self.repo.status(base, head)

return dict(zip(states, chngs))

#

# Cache findoutgoing results

#

def findoutgoing(self, parent):

ret = []

if parent in self.outgoingcache:

ret = self.outgoingcache[parent]

else:

self.ui.pushbuffer()

try:

pws = hg.repository(self.ui, parent)

ret = self.repo.findoutgoing(pws)

except repo.RepoError:

self.ui.warn(

"Warning: Parent workspace %s is not accessible\n" % parent)

self.ui.warn("active list will be incomplete\n\n")

self.outgoingcache[parent] = ret

self.ui.popbuffer()

return ret

def modified(self):

'''Return a list of files modified in the workspace'''

wctx = self.workingctx()

return sorted(wctx.files() + wctx.deleted()) or None

def merged(self):

'''Return boolean indicating whether the workspace has an uncommitted

wctx = self.workingctx()

return len(wctx.parents()) > 1

def branched(self):

'''Return boolean indicating whether the workspace has an

wctx = self.workingctx()

return wctx.branch() != wctx.parents()[0].branch()

def active(self, parent=None):

'''Return an ActiveList describing changes between workspace

parent = self.parent(parent)

if parent in self.activecache:

return self.activecache[parent]

if parent:

outgoing = self.findoutgoing(parent)

outnodes = self.repo.changelog.nodesbetween(outgoing)[0]

else:

outgoing = [] # No parent, no outgoing nodes

outnodes = []

localtip = self._localtip(outnodes, self.workingctx())

if localtip.rev() is None:

heads = localtip.parents()

else:

heads = [localtip]

ctxs = [self.repo.changectx(n) for n in

self.repo.changelog.nodesbetween(outgoing,

[h.node() for h in heads])[0]]

if localtip.rev() is None:

ctxs.append(localtip)

act = ActiveList(self, self._parenttip(heads, outnodes), ctxs)

self.activecache[parent] = act

return act

def pdiff(self, pats, opts, parent=None):

'Return diffs relative to PARENT, as best as we can make out'

parent = self.parent(parent)

act = self.active(parent)

#

# act.localtip maybe nil, in the case of uncommitted local

# changes.

#

if not act.revs:

return

matchfunc = self.matcher(pats, opts)

opts = patch.diffopts(self.ui, opts)

return self.diff(act.parenttip.node(), act.localtip.node(),

match=matchfunc, opts=opts)

#

# Theory:

#

# We wish to go from a single series of consecutive changesets

# (possibly including merges with the parent) to a single

# changeset faithfully representing contents and copy history.

#

# We achieve this in a somewhat confusing fashion.

#

# - Sanity check the workspace

# - Update the workspace to tip

# - Enter into the dirstate the sum total of file contents in the

# to-be-squished changesets

# - Commit this in-progress change (which has no changes at all,

# in reality) On top of the effective parent tip.

# - Strip the child-local branch(es) (see ActiveList.bases())

#

def squishdeltas(self, active, message, user=None):

'''Create a single conglomerate changeset, with log message MESSAGE

def strip_tags(nodes):

'''Remove any tags referring to the specified nodes.'''

if os.path.exists(self.repo.join('localtags')):

fh = self.repo.opener('localtags').readlines()

tags = [t for t in fh if t.split(' ')[0] not in nodes]

fh = self.repo.opener('localtags', 'w', atomictemp=True)

fh.writelines(tags)

fh.rename()

if os.path.exists(self.repo.wjoin('.hgtags')):

fh = self.repo.wopener('.hgtags', 'rb').readlines()

tags = [t for t in fh if t.split(' ')[0] not in nodes]

fh = self.repo.wopener('.hgtags', 'wb', atomictemp=True)

fh.writelines(tags)

fh.rename()

wlock = self.repo.wlock()

lock = self.repo.lock()

#

# The files involved need to be present in the workspace and

# not otherwise molested, rather than the workspace not being

# modified we also need to prevent files being deleted (but

# left versioned) too.

#

# The easiest way to achieve this is to update the working

# copy to tip.

#

self.clean()

try:

strip_tags([node.hex(ctx.node()) for ctx in active.revs])

except EnvironmentError, e:

raise util.Abort('Could not recommit tags: %s\n' % e)

#

# For copied files, we need to enter the copy into the

# dirstate before we force the commit such that the

# file logs of both branches (old and new) contain

# representation of the copy.

#

parentman = active.parenttip.manifest()

for entry in active:

if not entry.is_renamed() and not entry.is_copied():

continue

assert entry.parentname in parentman, \

("parentname '%s' (of '%s') not in parent" %

(entry.parentname, entry.name))

#

# If the source file exists, and used to be versioned

# this will cause this to become a true copy

# (re-introducing the source file)

#

# We bandaid this, by removing the source file in this

# case. If we're here, the user has already agreed to this

# from above.

#

if (entry.is_renamed() and

os.path.exists(self.repo.wjoin(entry.parentname))):

os.unlink(self.repo.wjoin(entry.parentname))

self.repo.copy(entry.parentname, entry.name)

if active.files():

extra = {'branch': active.localtip.branch()}

self.repo.commit(files=active.files(), text=message,

user=user, p1=active.parenttip.node(), p2=None,

extra=extra)

wsstate = "recommitted changeset"

self.clean()

else:

#

# If all we're doing is stripping the old nodes, we want to

# update the working copy such that we're not at a revision

# that's about to go away.

#

wsstate = "tip changeset"

self.clean(rev=active.parenttip.node())

# Silence all the strip and update fun

self.ui.pushbuffer()

#

# We must strip away the old representation of the child

# branch(es). This may involve stripping a theoretically

# large number of branches in certain cases

#

bases = active.bases()

try:

try:

for basenode in bases:

repair.strip(self.ui, self.repo, basenode, backup=False)

except:

#

# If this fails, it may leave us in a surprising place in

# the history.

#

# We want to warn the user that something went wrong,

# and what will happen next, re-raise the exception, and

# bring the working copy back into a consistent state

# (which the finally block will do)

#

self.ui.warn("stripping failed, your workspace will have "

"superfluous heads.\n"

"your workspace has been updated to the "

"%s.\n" % wsstate)

raise # Re-raise the exception

finally:

#

# We need to remove Hg's undo information (used for rollback),

# since it refers to data that will probably not exist after

# the strip.

#

self.clean()

self.repo.dirstate.write() # Flush the dirstate

self.repo.invalidate() # Invalidate caches

if os.path.exists(self.repo.sjoin('undo')):

try:

os.unlink(self.repo.sjoin('undo'))

except EnvironmentError, e:

raise util.Abort('failed to remove undo data: %s\n' % e)

self.ui.popbuffer()

def filepath(self, path):

'Return the full path to a workspace file.'

return self.repo.pathto(path)

def clean(self, rev=None):

'''Bring workspace up to REV (or tip) forcefully (discarding in

if rev != None:

rev = self.repo.lookup(rev)

else:

rev = self.repo.changelog.tip()

wlock = self.repo.wlock()

hg.clean(self.repo, rev, show_stats=False)

def mq_applied(self):

'''True if the workspace has Mq patches applied'''

q = mq.queue(self.ui, self.repo.join(''))

return q.applied

if Version.at_least("1.1"):

def workingctx(self):

return self.repo.changectx(None)

def flags(self, ctx):

return ctx.flags()

def matcher(self, pats, opts):

return cmdutil.match(self.repo, pats, opts)

def diff(self, node1=None, node2=None, match=None, opts=None):

ret = cStringIO.StringIO()

for chunk in patch.diff(self.repo, node1, node2, match=match,

opts=opts):

ret.write(chunk)

return ret.getvalue()

else:

def workingctx(self):

return self.repo.workingctx()

def flags(self, ctx):

return ctx.fileflags()

def matcher(self, pats, opts):

return cmdutil.matchpats(self.repo, pats, opts)[1]

def diff(self, node1=None, node2=None, match=None, opts=None):

ret = cStringIO.StringIO()

imatch = match or util.always

patch.diff(self.repo, node1, node2, fp=ret, match=imatch,

opts=opts)

return ret.getvalue()