def remoteui(repo, opts):
if hasattr(cmdutil, 'remoteui'):
# Mercurial 1.5 and lower
return cmdutil.remoteui(repo, opts)
else:
# Mercurial 1.6 and higher
return hg.remoteui(repo, opts)
def remoteui(repo, opts):
if hasattr(cmdutil, 'remoteui'):
# Mercurial 1.5 and lower
return cmdutil.remoteui(repo, opts)
else:
# Mercurial 1.6 and higher
return hg.remoteui(repo, opts)
def nclone(ui, source, dest=None, **opts):
'''make a copy of an existing repository and all nested repositories
Create a copy of an existing repository in a new directory.
Look at the help of clone command for more informations.'''
origsource = ui.expandpath(source)
remotesource, remotebranch = hg.parseurl(origsource, opts.get('branch'))
if hasattr(hg, 'peer'):
remoterepo = hg.peer(ui, opts, remotesource)
localrepo = remoterepo.local()
if localrepo:
remoterepo = localrepo
else:
remoterepo = hg.repository(hg.remoteui(ui, opts), remotesource)
if dest is None:
dest = hg.defaultdest(source)
ui.status(_("destination directory: %s\n") % dest)
for npath in remoterepo.nested:
if npath == '.':
npath = ''
u = util.url(source)
if u.scheme:
nsource = '%s/%s' % (source, npath)
else:
nsource = os.path.join(source, npath)
ndest = os.path.join(dest, npath)
ui.status('[%s]\n' % os.path.normpath(
os.path.join(os.path.basename(dest),
ndest[len(dest) + 1:])))
commands.clone(ui, nsource, dest=ndest, **opts)
ui.status('\n')
def pull(oldpull, ui, repo, source="default", **opts):
# translate bookmark args to rev args for actual pull
if opts.get('bookmark'):
# this is an unpleasant hack as pull will do this internally
source, branches = hg.parseurl(ui.expandpath(source),
opts.get('branch'))
other = hg.repository(hg.remoteui(repo, opts), source)
rb = other.listkeys('bookmarks')
for b in opts['bookmark']:
if b not in rb:
raise util.Abort(_('remote bookmark %s not found!') % b)
opts.setdefault('rev', []).append(b)
result = oldpull(ui, repo, source, **opts)
# update specified bookmarks
if opts.get('bookmark'):
for b in opts['bookmark']:
# explicit pull overrides local bookmark if any
ui.status(_("importing bookmark %s\n") % b)
repo._bookmarks[b] = repo[rb[b]].node()
write(repo)
return result
def incoming(oldincoming, ui, repo, source="default", **opts):
if opts.get('bookmarks'):
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
other = hg.repository(hg.remoteui(repo, opts), source)
ui.status(_('comparing with %s\n') % url.hidepassword(source))
return diffbookmarks(ui, repo, other)
else:
return oldincoming(ui, repo, source, **opts)
def outgoing(oldoutgoing, ui, repo, dest=None, **opts):
if opts.get('bookmarks'):
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest, opts.get('branch'))
other = hg.repository(hg.remoteui(repo, opts), dest)
ui.status(_('comparing with %s\n') % url.hidepassword(dest))
return diffbookmarks(ui, other, repo)
else:
return oldoutgoing(ui, repo, dest, **opts)
def hg_clone(ui,
peeropts,
source,
dest=None,
pull=False,
rev=None,
update=True,
stream=False,
branch=None):
rui = hg.remoteui(ui, peeropts)
return hg.clone(rui, source, dest, pull, rev, update, stream)
def hg_clone(ui,
peeropts,
source,
dest=None,
pull=False,
revs=None,
update=True,
stream=False,
branch=None):
rui = hg.remoteui(ui, peeropts)
return hg.clone(rui, source, dest, pull, revs, update, stream)
def test(ui, repo, source, **opts):
source, branches = hg.parseurl(ui.expandpath(source),
opts.get('branch'))
other = hg.repository(hg.remoteui(repo, opts), source)
revs, checkout = hg.addbranchrevs(repo, other, branches,
opts.get('rev'))
if revs:
try:
revs = [other.lookup(rev) for rev in revs]
except CapabilityError:
err = _("Other repository doesn't support revision lookup, "
"so a rev cannot be specified.")
raise util.Abort(err)
def test(ui, repo, dest=None, **opts):
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest, opts.get('branch'))
revs, checkout = hg.addbranchrevs(repo, repo, branches,
opts.get('rev'))
if hasattr(hg, 'peer'):
other = hg.peer(ui, opts, dest)
localother = other.local()
if localother:
other = localother
else:
other = hg.repository(hg.remoteui(repo, opts), dest)
if revs:
revs = [other.lookup(rev) for rev in revs]
def getoutgoing(dest, revs):
'''Return the revisions present locally but not in dest'''
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest)
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
if revs:
revs = [repo.lookup(rev) for rev in revs]
other = hg.repository(hg.remoteui(repo, opts), dest)
ui.status(_('comparing with %s\n') % url.hidepassword(dest))
o = discovery.findoutgoing(repo, other)
if not o:
ui.status(_("no changes found\n"))
return []
o = repo.changelog.nodesbetween(o, revs)[0]
return [str(repo.changelog.rev(r)) for r in o]
def getoutgoing(dest, revs):
'''Return the revisions present locally but not in dest'''
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest)
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
if revs:
revs = [repo.lookup(rev) for rev in revs]
other = hg.repository(hg.remoteui(repo, opts), dest)
ui.status(_('comparing with %s\n') % url.hidepassword(dest))
o = discovery.findoutgoing(repo, other)
if not o:
ui.status(_("no changes found\n"))
return []
o = repo.changelog.nodesbetween(o, revs)[0]
return [str(repo.changelog.rev(r)) for r in o]
def relink(ui, repo, origin=None, **opts):
"""recreate hardlinks between two repositories
When repositories are cloned locally, their data files will be
hardlinked so that they only use the space of a single repository.
Unfortunately, subsequent pulls into either repository will break
hardlinks for any files touched by the new changesets, even if
both repositories end up pulling the same changes.
Similarly, passing --rev to "hg clone" will fail to use any
hardlinks, falling back to a complete copy of the source
repository.
This command lets you recreate those hardlinks and reclaim that
wasted space.
This repository will be relinked to share space with ORIGIN, which
must be on the same local disk. If ORIGIN is omitted, looks for
"default-relink", then "default", in [paths].
Do not attempt any read operations on this repository while the
command is running. (Both repositories will be locked against
writes.)
"""
if not hasattr(util, 'samefile') or not hasattr(util, 'samedevice'):
raise util.Abort(_('hardlinks are not supported on this system'))
src = hg.repository(
hg.remoteui(repo, opts),
ui.expandpath(origin or 'default-relink', origin or 'default'))
if not src.local():
raise util.Abort(_('must specify local origin repository'))
ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path))
if repo.root == src.root:
ui.status(_('there is nothing to relink\n'))
return
locallock = repo.lock()
try:
remotelock = src.lock()
try:
candidates = sorted(collect(src, ui))
targets = prune(candidates, src.store.path, repo.store.path, ui)
do_relink(src.store.path, repo.store.path, targets, ui)
finally:
remotelock.release()
finally:
locallock.release()
def relink(ui, repo, origin=None, **opts):
"""recreate hardlinks between two repositories
When repositories are cloned locally, their data files will be
hardlinked so that they only use the space of a single repository.
Unfortunately, subsequent pulls into either repository will break
hardlinks for any files touched by the new changesets, even if
both repositories end up pulling the same changes.
Similarly, passing --rev to "hg clone" will fail to use any
hardlinks, falling back to a complete copy of the source
repository.
This command lets you recreate those hardlinks and reclaim that
wasted space.
This repository will be relinked to share space with ORIGIN, which
must be on the same local disk. If ORIGIN is omitted, looks for
"default-relink", then "default", in [paths].
Do not attempt any read operations on this repository while the
command is running. (Both repositories will be locked against
writes.)
"""
if not hasattr(util, 'samefile') or not hasattr(util, 'samedevice'):
raise util.Abort(_('hardlinks are not supported on this system'))
src = hg.repository(
hg.remoteui(repo, opts),
ui.expandpath(origin or 'default-relink', origin or 'default'))
if not src.local():
raise util.Abort(_('must specify local origin repository'))
ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path))
if repo.root == src.root:
ui.status(_('there is nothing to relink\n'))
return
locallock = repo.lock()
try:
remotelock = src.lock()
try:
candidates = sorted(collect(src, ui))
targets = prune(candidates, src.store.path, repo.store.path, ui)
do_relink(src.store.path, repo.store.path, targets, ui)
finally:
remotelock.release()
finally:
locallock.release()
def push(oldpush, ui, repo, dest=None, **opts):
dopush = True
if opts.get('bookmark'):
dopush = False
for b in opts['bookmark']:
if b in repo._bookmarks:
dopush = True
opts.setdefault('rev', []).append(b)
result = 0
if dopush:
result = oldpush(ui, repo, dest, **opts)
if opts.get('bookmark'):
# this is an unpleasant hack as push will do this internally
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest, opts.get('branch'))
other = hg.repository(hg.remoteui(repo, opts), dest)
rb = other.listkeys('bookmarks')
for b in opts['bookmark']:
# explicit push overrides remote bookmark if any
if b in repo._bookmarks:
ui.status(_("exporting bookmark %s\n") % b)
new = repo[b].hex()
elif b in rb:
ui.status(_("deleting remote bookmark %s\n") % b)
new = '' # delete
else:
ui.warn(_('bookmark %s does not exist on the local '
'or remote repository!\n') % b)
return 2
old = rb.get(b, '')
r = other.pushkey('bookmarks', b, old, new)
if not r:
ui.warn(_('updating bookmark %s failed!\n') % b)
if not result:
result = 2
return result
def _openstore(repo, remote=None, put=False):
ui = repo.ui
if not remote:
path = getattr(repo, 'bfpullsource', None) or \
ui.expandpath('default-push', 'default')
# If 'default-push' and 'default' can't be expanded
# they are just returned. In that case use the empty string which
# use the filescheme.
if path == 'default-push' or path == 'default':
path = ''
remote = repo
else:
remote = hg.repository(hg.remoteui(ui, {}), path, False)
# The path could be a scheme so use Mercurial's normal functionality
# to resolve the scheme to a repository and use its path
path = hasattr(remote, 'url') and remote.url() or remote.path
match = _scheme_re.match(path)
if not match: # regular filesystem path
scheme = 'file'
else:
scheme = match.group(1)
try:
storeproviders = _storeprovider[scheme]
except KeyError:
raise util.Abort(_('unsupported URL scheme %r') % scheme)
for (mod, klass) in storeproviders:
klass = getattr(mod, klass)
try:
return klass(ui, repo, remote)
except remotestore.storeprotonotcapable:
pass
raise util.Abort(_('%s does not appear to be a bfile store'), path)
def histedit(ui, repo, *parent, **opts):
"""hg histedit <parent>
"""
# TODO only abort if we try and histedit mq patches, not just
# blanket if mq patches are applied somewhere
mq = getattr(repo, 'mq', None)
if mq and mq.applied:
raise util.Abort(_('source has mq patches applied'))
parent = list(parent) + opts.get('rev', [])
if opts.get('outgoing'):
if len(parent) > 1:
raise util.Abort('only one repo argument allowed with --outgoing')
elif parent:
parent = parent[0]
dest = ui.expandpath(parent or 'default-push', parent or 'default')
dest, revs = hg.parseurl(dest, None)[:2]
if isinstance(revs, tuple):
# hg >= 1.6
revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
other = hg.repository(hg.remoteui(repo, opts), dest)
# hg >= 1.9
findoutgoing = getattr(discovery, 'findoutgoing', None)
if findoutgoing is None:
if getattr(discovery, 'outgoing', None) is not None:
def findoutgoing(repo, other, force=False):
out = discovery.findcommonoutgoing(repo,
other, [],
force=force)
return out.missing[0:1]
else:
# hg 1.9 and 2.0
def findoutgoing(repo, other, force=False):
common, outheads = discovery.findcommonoutgoing(
repo, other, [], force=force)
return repo.changelog.findmissing(common,
outheads)[0:1]
else:
other = hg.repository(ui, dest)
def findoutgoing(repo, other, force=False):
return repo.findoutgoing(other, force=force)
if revs:
revs = [repo.lookup(rev) for rev in revs]
ui.status(_('comparing with %s\n') % hidepassword(dest))
parent = findoutgoing(repo, other, force=opts.get('force'))
else:
if opts.get('force'):
raise util.Abort('--force only allowed with --outgoing')
if opts.get('continue', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --continue')
(parentctxnode, created, replaced, tmpnodes, existing, rules, keep,
tip, replacemap) = readstate(repo)
currentparent, wantnull = repo.dirstate.parents()
parentctx = repo[parentctxnode]
# discover any nodes the user has added in the interim
newchildren = [
c for c in parentctx.children() if c.node() not in existing
]
action, currentnode = rules.pop(0)
while newchildren:
if action in [
'f',
'fold',
]:
tmpnodes.extend([n.node() for n in newchildren])
else:
created.extend([n.node() for n in newchildren])
newchildren = filter(
lambda x: x.node() not in existing,
reduce(lambda x, y: x + y,
map(lambda r: r.children(), newchildren)))
m, a, r, d = repo.status()[:4]
oldctx = repo[currentnode]
message = oldctx.description()
if action in ('e', 'edit', 'm', 'mess'):
message = ui.edit(message, ui.username())
elif action in (
'f',
'fold',
):
message = 'fold-temp-revision %s' % currentnode
new = None
if m or a or r or d:
new = repo.commit(text=message,
user=oldctx.user(),
date=oldctx.date(),
extra=oldctx.extra())
if action in ('f', 'fold'):
if new:
tmpnodes.append(new)
else:
new = newchildren[-1]
(
parentctx,
created_,
replaced_,
tmpnodes_,
) = finishfold(ui, repo, parentctx, oldctx, new, opts, newchildren)
replaced.extend(replaced_)
created.extend(created_)
tmpnodes.extend(tmpnodes_)
elif action not in ('d', 'drop'):
if new != oldctx.node():
replaced.append(oldctx.node())
if new:
if new != oldctx.node():
created.append(new)
parentctx = repo[new]
elif opts.get('abort', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --abort')
(parentctxnode, created, replaced, tmpnodes, existing, rules, keep,
tip, replacemap) = readstate(repo)
ui.debug('restore wc to old tip %s\n' % node.hex(tip))
hg.clean(repo, tip)
ui.debug('should strip created nodes %s\n' %
', '.join([node.hex(n)[:12] for n in created]))
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for nodes in (
created,
tmpnodes,
):
for n in reversed(nodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
return
else:
bailifchanged(repo)
if os.path.exists(os.path.join(repo.path, 'histedit-state')):
raise util.Abort('history edit already in progress, try '
'--continue or --abort')
tip, empty = repo.dirstate.parents()
if len(parent) != 1:
raise util.Abort('requires exactly one parent revision')
parent = _revsingle(repo, parent[0]).node()
keep = opts.get('keep', False)
revs = between(repo, parent, tip, keep)
ctxs = [repo[r] for r in revs]
existing = [r.node() for r in ctxs]
rules = opts.get('commands', '')
if not rules:
rules = '\n'.join([makedesc(c) for c in ctxs])
rules += editcomment % (
node.hex(parent)[:12],
node.hex(tip)[:12],
)
rules = ui.edit(rules, ui.username())
# Save edit rules in .hg/histedit-last-edit.txt in case
# the user needs to ask for help after something
# surprising happens.
f = open(repo.join('histedit-last-edit.txt'), 'w')
f.write(rules)
f.close()
else:
f = open(rules)
rules = f.read()
f.close()
rules = [
l for l in (r.strip() for r in rules.splitlines())
if l and not l[0] == '#'
]
rules = verifyrules(rules, repo, ctxs)
parentctx = repo[parent].parents()[0]
keep = opts.get('keep', False)
replaced = []
replacemap = {}
tmpnodes = []
created = []
while rules:
writestate(repo, parentctx.node(), created, replaced, tmpnodes,
existing, rules, keep, tip, replacemap)
action, ha = rules.pop(0)
(
parentctx,
created_,
replaced_,
tmpnodes_,
) = actiontable[action](ui, repo, parentctx, ha, opts)
hexshort = lambda x: node.hex(x)[:12]
if replaced_:
clen, rlen = len(created_), len(replaced_)
if clen == rlen == 1:
ui.debug('histedit: exact replacement of %s with %s\n' %
(hexshort(replaced_[0]), hexshort(created_[0])))
replacemap[replaced_[0]] = created_[0]
elif clen > rlen:
assert rlen == 1, ('unexpected replacement of '
'%d changes with %d changes' % (rlen, clen))
# made more changesets than we're replacing
# TODO synthesize patch names for created patches
replacemap[replaced_[0]] = created_[-1]
ui.debug('histedit: created many, assuming %s replaced by %s' %
(hexshort(replaced_[0]), hexshort(created_[-1])))
elif rlen > clen:
if not created_:
# This must be a drop. Try and put our metadata on
# the parent change.
assert rlen == 1
r = replaced_[0]
ui.debug('histedit: %s seems replaced with nothing, '
'finding a parent\n' % (hexshort(r)))
pctx = repo[r].parents()[0]
if pctx.node() in replacemap:
ui.debug('histedit: parent is already replaced\n')
replacemap[r] = replacemap[pctx.node()]
else:
replacemap[r] = pctx.node()
ui.debug('histedit: %s best replaced by %s\n' %
(hexshort(r), hexshort(replacemap[r])))
else:
assert len(created_) == 1
for r in replaced_:
ui.debug('histedit: %s replaced by %s\n' %
(hexshort(r), hexshort(created_[0])))
replacemap[r] = created_[0]
else:
assert False, ('Unhandled case in replacement mapping! '
'replacing %d changes with %d changes' %
(rlen, clen))
created.extend(created_)
replaced.extend(replaced_)
tmpnodes.extend(tmpnodes_)
hg.update(repo, parentctx.node())
if not keep:
if replacemap:
ui.note('histedit: Should update metadata for the following '
'changes:\n')
for old, new in replacemap.iteritems():
if old in tmpnodes or old in created:
# can't have any metadata we'd want to update
continue
while new in replacemap:
new = replacemap[new]
ui.note('histedit: %s to %s\n' %
(hexshort(old), hexshort(new)))
octx = repo[old]
if bookmarks is not None:
marks = octx.bookmarks()
if marks:
ui.note('histedit: moving bookmarks %s\n' %
', '.join(marks))
for mark in marks:
repo._bookmarks[mark] = new
bookmarks.write(repo)
# TODO update mq state
ui.debug('should strip replaced nodes %s\n' %
', '.join([node.hex(n)[:12] for n in replaced]))
for n in sorted(replaced, key=lambda x: repo[x].rev()):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for n in reversed(tmpnodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
if os.path.exists(repo.sjoin('undo')):
os.unlink(repo.sjoin('undo'))
def rui():
try:
return hg.remoteui(repo, opts)
except AttributeError:
# pre 1.6
return cmdutil.remoteui(repo, opts)
def histedit(ui, repo, *parent, **opts):
"""hg histedit <parent>
"""
# TODO only abort if we try and histedit mq patches, not just
# blanket if mq patches are applied somewhere
mq = getattr(repo, 'mq', None)
if mq and mq.applied:
raise util.Abort(_('source has mq patches applied'))
parent = list(parent) + opts.get('rev', [])
if opts.get('outgoing'):
if len(parent) > 1:
raise util.Abort('only one repo argument allowed with --outgoing')
elif parent:
parent = parent[0]
dest = ui.expandpath(parent or 'default-push', parent or 'default')
dest, revs = hg.parseurl(dest, None)[:2]
if isinstance(revs, tuple):
# hg >= 1.6
revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
other = hg.repository(hg.remoteui(repo, opts), dest)
# hg >= 1.9
findoutgoing = getattr(discovery, 'findoutgoing', None)
if findoutgoing is None:
if getattr(discovery, 'outgoing', None) is not None:
def findoutgoing(repo, other, force=False):
out = discovery.findcommonoutgoing(repo,
other, [],
force=force)
return out.missing[0:1]
else:
# hg 1.9 and 2.0
def findoutgoing(repo, other, force=False):
common, outheads = discovery.findcommonoutgoing(
repo, other, [], force=force)
return repo.changelog.findmissing(common,
outheads)[0:1]
else:
other = hg.repository(ui, dest)
def findoutgoing(repo, other, force=False):
return repo.findoutgoing(other, force=force)
if revs:
revs = [repo.lookup(rev) for rev in revs]
ui.status(_('comparing with %s\n') % hidepassword(dest))
parent = findoutgoing(repo, other, force=opts.get('force'))
else:
if opts.get('force'):
raise util.Abort('--force only allowed with --outgoing')
if opts.get('continue', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --continue')
(
parentctxnode,
created,
replaced,
tmpnodes,
existing,
rules,
keep,
tip,
) = readstate(repo)
currentparent, wantnull = repo.dirstate.parents()
parentctx = repo[parentctxnode]
# discover any nodes the user has added in the interim
newchildren = [
c for c in parentctx.children() if c.node() not in existing
]
action, currentnode = rules.pop(0)
while newchildren:
if action in [
'f',
'fold',
]:
tmpnodes.extend([n.node() for n in newchildren])
else:
created.extend([n.node() for n in newchildren])
newchildren = filter(
lambda x: x.node() not in existing,
reduce(lambda x, y: x + y,
map(lambda r: r.children(), newchildren)))
m, a, r, d = repo.status()[:4]
oldctx = repo[currentnode]
message = oldctx.description()
if action in ('e', 'edit', 'm', 'mess'):
message = ui.edit(message, ui.username())
elif action in (
'f',
'fold',
):
message = 'fold-temp-revision %s' % currentnode
new = None
if m or a or r or d:
new = repo.commit(text=message,
user=oldctx.user(),
date=oldctx.date(),
extra=oldctx.extra())
if action in ('f', 'fold'):
if new:
tmpnodes.append(new)
else:
new = newchildren[-1]
(
parentctx,
created_,
replaced_,
tmpnodes_,
) = finishfold(ui, repo, parentctx, oldctx, new, opts, newchildren)
replaced.extend(replaced_)
created.extend(created_)
tmpnodes.extend(tmpnodes_)
elif action not in ('d', 'drop'):
if new != oldctx.node():
replaced.append(oldctx.node())
if new:
if new != oldctx.node():
created.append(new)
parentctx = repo[new]
elif opts.get('abort', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --abort')
(
parentctxnode,
created,
replaced,
tmpnodes,
existing,
rules,
keep,
tip,
) = readstate(repo)
ui.debug('restore wc to old tip %s\n' % node.hex(tip))
hg.clean(repo, tip)
ui.debug('should strip created nodes %s\n' %
', '.join([node.hex(n)[:12] for n in created]))
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for nodes in (
created,
tmpnodes,
):
for n in reversed(nodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
return
else:
bailifchanged(repo)
if os.path.exists(os.path.join(repo.path, 'histedit-state')):
raise util.Abort('history edit already in progress, try '
'--continue or --abort')
tip, empty = repo.dirstate.parents()
if len(parent) != 1:
raise util.Abort('requires exactly one parent revision')
parent = _revsingle(repo, parent[0]).node()
keep = opts.get('keep', False)
revs = between(repo, parent, tip, keep)
ctxs = [repo[r] for r in revs]
existing = [r.node() for r in ctxs]
rules = opts.get('commands', '')
if not rules:
rules = '\n'.join([makedesc(c) for c in ctxs])
rules += editcomment % (
node.hex(parent)[:12],
node.hex(tip)[:12],
)
rules = ui.edit(rules, ui.username())
# Save edit rules in .hg/histedit-last-edit.txt in case
# the user needs to ask for help after something
# surprising happens.
f = open(repo.join('histedit-last-edit.txt'), 'w')
f.write(rules)
f.close()
else:
f = open(rules)
rules = f.read()
f.close()
rules = [
l for l in (r.strip() for r in rules.splitlines())
if l and not l[0] == '#'
]
rules = verifyrules(rules, repo, ctxs)
parentctx = repo[parent].parents()[0]
keep = opts.get('keep', False)
replaced = []
tmpnodes = []
created = []
while rules:
writestate(repo, parentctx.node(), created, replaced, tmpnodes,
existing, rules, keep, tip)
action, ha = rules.pop(0)
(
parentctx,
created_,
replaced_,
tmpnodes_,
) = actiontable[action](ui, repo, parentctx, ha, opts)
created.extend(created_)
replaced.extend(replaced_)
tmpnodes.extend(tmpnodes_)
hg.update(repo, parentctx.node())
if not keep:
ui.debug('should strip replaced nodes %s\n' %
', '.join([node.hex(n)[:12] for n in replaced]))
for n in sorted(replaced,
lambda x, y: cmp(repo[x].rev(), repo[y].rev())):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for n in reversed(tmpnodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
def create_from(self, source):
hg.clone(hg.remoteui(self.ui, {}), {}, str(source), self.path.strpath)
def histedit(ui, repo, *parent, **opts):
"""hg histedit <parent>
"""
# TODO only abort if we try and histedit mq patches, not just
# blanket if mq patches are applied somewhere
mq = getattr(repo, 'mq', None)
if mq and mq.applied:
raise util.Abort(_('source has mq patches applied'))
parent = list(parent) + opts.get('rev', [])
if opts.get('outgoing'):
if len(parent) > 1:
raise util.Abort('only one repo argument allowed with --outgoing')
elif parent:
parent = parent[0]
dest = ui.expandpath(parent or 'default-push', parent or 'default')
dest, revs = hg.parseurl(dest, None)[:2]
if isinstance(revs, tuple):
# hg >= 1.6
revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
other = hg.repository(hg.remoteui(repo, opts), dest)
# hg >= 1.9
findoutgoing = getattr(discovery, 'findoutgoing', None)
if findoutgoing is None:
if getattr(discovery, 'outgoing', None) is not None:
def findoutgoing(repo, other, force=False):
out = discovery.findcommonoutgoing(
repo, other, [], force=force)
return out.missing[0:1]
else:
# hg 1.9 and 2.0
def findoutgoing(repo, other, force=False):
common, outheads = discovery.findcommonoutgoing(
repo, other, [], force=force)
return repo.changelog.findmissing(common, outheads)[0:1]
else:
other = hg.repository(ui, dest)
def findoutgoing(repo, other, force=False):
return repo.findoutgoing(other, force=force)
if revs:
revs = [repo.lookup(rev) for rev in revs]
ui.status(_('comparing with %s\n') % hidepassword(dest))
parent = findoutgoing(repo, other, force=opts.get('force'))
else:
if opts.get('force'):
raise util.Abort('--force only allowed with --outgoing')
if opts.get('continue', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --continue')
(parentctxnode, created, replaced,
tmpnodes, existing, rules, keep, tip, replacemap ) = readstate(repo)
currentparent, wantnull = repo.dirstate.parents()
parentctx = repo[parentctxnode]
# discover any nodes the user has added in the interim
newchildren = [c for c in parentctx.children()
if c.node() not in existing]
action, currentnode = rules.pop(0)
while newchildren:
if action in ['f', 'fold', ]:
tmpnodes.extend([n.node() for n in newchildren])
else:
created.extend([n.node() for n in newchildren])
newchildren = filter(lambda x: x.node() not in existing,
reduce(lambda x, y: x + y,
map(lambda r: r.children(),
newchildren)))
m, a, r, d = repo.status()[:4]
oldctx = repo[currentnode]
message = oldctx.description()
if action in ('e', 'edit', 'm', 'mess'):
message = ui.edit(message, ui.username())
elif action in ('f', 'fold', ):
message = 'fold-temp-revision %s' % currentnode
new = None
if m or a or r or d:
new = repo.commit(text=message, user=oldctx.user(), date=oldctx.date(),
extra=oldctx.extra())
if action in ('f', 'fold'):
if new:
tmpnodes.append(new)
else:
new = newchildren[-1]
(parentctx, created_,
replaced_, tmpnodes_, ) = finishfold(ui, repo,
parentctx, oldctx, new,
opts, newchildren)
replaced.extend(replaced_)
created.extend(created_)
tmpnodes.extend(tmpnodes_)
elif action not in ('d', 'drop'):
if new != oldctx.node():
replaced.append(oldctx.node())
if new:
if new != oldctx.node():
created.append(new)
parentctx = repo[new]
elif opts.get('abort', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --abort')
(parentctxnode, created, replaced, tmpnodes,
existing, rules, keep, tip, replacemap) = readstate(repo)
ui.debug('restore wc to old tip %s\n' % node.hex(tip))
hg.clean(repo, tip)
ui.debug('should strip created nodes %s\n' %
', '.join([node.hex(n)[:12] for n in created]))
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for nodes in (created, tmpnodes, ):
for n in reversed(nodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
return
else:
bailifchanged(repo)
if os.path.exists(os.path.join(repo.path, 'histedit-state')):
raise util.Abort('history edit already in progress, try '
'--continue or --abort')
tip, empty = repo.dirstate.parents()
if len(parent) != 1:
raise util.Abort('requires exactly one parent revision')
parent = _revsingle(repo, parent[0]).node()
keep = opts.get('keep', False)
revs = between(repo, parent, tip, keep)
ctxs = [repo[r] for r in revs]
existing = [r.node() for r in ctxs]
rules = opts.get('commands', '')
if not rules:
rules = '\n'.join([makedesc(c) for c in ctxs])
rules += editcomment % (node.hex(parent)[:12], node.hex(tip)[:12], )
rules = ui.edit(rules, ui.username())
# Save edit rules in .hg/histedit-last-edit.txt in case
# the user needs to ask for help after something
# surprising happens.
f = open(repo.join('histedit-last-edit.txt'), 'w')
f.write(rules)
f.close()
else:
f = open(rules)
rules = f.read()
f.close()
rules = [l for l in (r.strip() for r in rules.splitlines())
if l and not l[0] == '#']
rules = verifyrules(rules, repo, ctxs)
parentctx = repo[parent].parents()[0]
keep = opts.get('keep', False)
replaced = []
replacemap = {}
tmpnodes = []
created = []
while rules:
writestate(repo, parentctx.node(), created, replaced, tmpnodes, existing,
rules, keep, tip, replacemap)
action, ha = rules.pop(0)
(parentctx, created_,
replaced_, tmpnodes_, ) = actiontable[action](ui, repo,
parentctx, ha,
opts)
hexshort = lambda x: node.hex(x)[:12]
if replaced_:
clen, rlen = len(created_), len(replaced_)
if clen == rlen == 1:
ui.debug('histedit: exact replacement of %s with %s\n' % (
hexshort(replaced_[0]), hexshort(created_[0])))
replacemap[replaced_[0]] = created_[0]
elif clen > rlen:
assert rlen == 1, ('unexpected replacement of '
'%d changes with %d changes' % (rlen, clen))
# made more changesets than we're replacing
# TODO synthesize patch names for created patches
replacemap[replaced_[0]] = created_[-1]
ui.debug('histedit: created many, assuming %s replaced by %s' % (
hexshort(replaced_[0]), hexshort(created_[-1])))
elif rlen > clen:
if not created_:
# This must be a drop. Try and put our metadata on
# the parent change.
assert rlen == 1
r = replaced_[0]
ui.debug('histedit: %s seems replaced with nothing, '
'finding a parent\n' % (hexshort(r)))
pctx = repo[r].parents()[0]
if pctx.node() in replacemap:
ui.debug('histedit: parent is already replaced\n')
replacemap[r] = replacemap[pctx.node()]
else:
replacemap[r] = pctx.node()
ui.debug('histedit: %s best replaced by %s\n' % (
hexshort(r), hexshort(replacemap[r])))
else:
assert len(created_) == 1
for r in replaced_:
ui.debug('histedit: %s replaced by %s\n' % (
hexshort(r), hexshort(created_[0])))
replacemap[r] = created_[0]
else:
assert False, (
'Unhandled case in replacement mapping! '
'replacing %d changes with %d changes' % (rlen, clen))
created.extend(created_)
replaced.extend(replaced_)
tmpnodes.extend(tmpnodes_)
hg.update(repo, parentctx.node())
if not keep:
if replacemap:
ui.note('histedit: Should update metadata for the following '
'changes:\n')
for old, new in replacemap.iteritems():
if old in tmpnodes or old in created:
# can't have any metadata we'd want to update
continue
while new in replacemap:
new = replacemap[new]
ui.note('histedit: %s to %s\n' % (hexshort(old), hexshort(new)))
octx = repo[old]
if bookmarks is not None:
marks = octx.bookmarks()
if marks:
ui.note('histedit: moving bookmarks %s\n' %
', '.join(marks))
for mark in marks:
repo._bookmarks[mark] = new
bookmarks.write(repo)
# TODO update mq state
ui.debug('should strip replaced nodes %s\n' %
', '.join([node.hex(n)[:12] for n in replaced]))
for n in sorted(replaced, key=lambda x: repo[x].rev()):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for n in reversed(tmpnodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
if os.path.exists(repo.sjoin('undo')):
os.unlink(repo.sjoin('undo'))
def rui():
try:
return hg.remoteui(repo, opts)
except AttributeError:
# pre 1.6
return cmdutil.remoteui(repo, opts)
def histedit(ui, repo, *parent, **opts):
"""hg histedit <parent>
"""
# TODO only abort if we try and histedit mq patches, not just
# blanket if mq patches are applied somewhere
mq = getattr(repo, 'mq', None)
if mq and mq.applied:
raise util.Abort(_('source has mq patches applied'))
parent = list(parent) + opts.get('rev', [])
if opts.get('outgoing'):
if len(parent) > 1:
raise util.Abort('only one repo argument allowed with --outgoing')
elif parent:
parent = parent[0]
dest = ui.expandpath(parent or 'default-push', parent or 'default')
dest, revs = hg.parseurl(dest, None)[:2]
if isinstance(revs, tuple):
# python >= 1.6
revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
other = hg.repository(hg.remoteui(repo, opts), dest)
findoutgoing = discovery.findoutgoing
else:
other = hg.repository(ui, dest)
def findoutgoing(repo, other, force=False):
return repo.findoutgoing(other, force=force)
if revs:
revs = [repo.lookup(rev) for rev in revs]
ui.status(_('comparing with %s\n') % url.hidepassword(dest))
parent = findoutgoing(repo, other, force=opts.get('force'))
else:
if opts.get('force'):
raise util.Abort('--force only allowed with --outgoing')
if opts.get('continue', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --continue')
(parentctxnode, created, replaced,
tmpnodes, existing, rules, keep, tip, ) = readstate(repo)
currentparent, wantnull = repo.dirstate.parents()
parentctx = repo[parentctxnode]
# discover any nodes the user has added in the interim
newchildren = [c for c in parentctx.children()
if c.node() not in existing]
action, currentnode = rules.pop(0)
while newchildren:
if action in ['f', 'fold', ]:
tmpnodes.extend([n.node() for n in newchildren])
else:
created.extend([n.node() for n in newchildren])
newchildren = filter(lambda x: x.node() not in existing,
reduce(lambda x, y: x + y,
map(lambda r: r.children(),
newchildren)))
m, a, r, d = repo.status()[:4]
oldctx = repo[currentnode]
message = oldctx.description()
if action in ('e', 'edit', ):
message = ui.edit(message, ui.username())
elif action in ('f', 'fold', ):
message = 'fold-temp-revision %s' % currentnode
new = None
if m or a or r or d:
new = repo.commit(text=message, user=oldctx.user(), date=oldctx.date(),
extra=oldctx.extra())
if action in ('e', 'edit', 'p', 'pick', ):
if new != oldctx.node():
replaced.append(oldctx.node())
if new:
if new != oldctx.node():
created.append(new)
parentctx = repo[new]
else: # fold
if new:
tmpnodes.append(new)
else:
new = newchildren[-1]
(parentctx, created_,
replaced_, tmpnodes_, ) = finishfold(ui, repo,
parentctx, oldctx, new,
opts, newchildren)
replaced.extend(replaced_)
created.extend(created_)
tmpnodes.extend(tmpnodes_)
elif opts.get('abort', False):
if len(parent) != 0:
raise util.Abort('no arguments allowed with --abort')
(parentctxnode, created, replaced, tmpnodes,
existing, rules, keep, tip, ) = readstate(repo)
ui.debug('restore wc to old tip %s\n' % node.hex(tip))
hg.clean(repo, tip)
ui.debug('should strip created nodes %s\n' %
', '.join([node.hex(n)[:12] for n in created]))
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for nodes in (created, tmpnodes, ):
for n in reversed(nodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
return
else:
cmdutil.bail_if_changed(repo)
if os.path.exists(os.path.join(repo.path, 'histedit-state')):
raise util.Abort('history edit already in progress, try '
'--continue or --abort')
tip, empty = repo.dirstate.parents()
if len(parent) != 1:
raise util.Abort('requires exactly one parent revision')
parent = _revsingle(repo, parent[0]).node()
keep = opts.get('keep', False)
revs = between(repo, parent, tip, keep)
ctxs = [repo[r] for r in revs]
existing = [r.node() for r in ctxs]
rules = opts.get('commands', '')
if not rules:
rules = '\n'.join([('pick %s %s' % (
c.hex()[:12], c.description().splitlines()[0]))[:80]
for c in ctxs])
rules += editcomment % (node.hex(parent)[:12], node.hex(tip)[:12], )
rules = ui.edit(rules, ui.username())
else:
f = open(rules)
rules = f.read()
f.close()
rules = [l for l in (r.strip() for r in rules.splitlines())
if l and not l[0] == '#']
rules = verifyrules(rules, repo, ctxs)
parentctx = repo[parent].parents()[0]
keep = opts.get('keep', False)
replaced = []
tmpnodes = []
created = []
while rules:
writestate(repo, parentctx.node(), created, replaced, tmpnodes, existing,
rules, keep, tip)
action, ha = rules.pop(0)
(parentctx, created_,
replaced_, tmpnodes_, ) = actiontable[action](ui, repo,
parentctx, ha,
opts)
created.extend(created_)
replaced.extend(replaced_)
tmpnodes.extend(tmpnodes_)
hg.update(repo, parentctx.node())
if not keep:
ui.debug('should strip replaced nodes %s\n' %
', '.join([node.hex(n)[:12] for n in replaced]))
for n in sorted(replaced, lambda x, y: cmp(repo[x].rev(), repo[y].rev())):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
ui.debug('should strip temp nodes %s\n' %
', '.join([node.hex(n)[:12] for n in tmpnodes]))
for n in reversed(tmpnodes):
try:
repair.strip(ui, repo, n)
except error.LookupError:
pass
os.unlink(os.path.join(repo.path, 'histedit-state'))
def fetch(ui, repo, source='default', **opts):
'''pull changes from a remote repository, merge new changes if needed.
This finds all changes from the repository at the specified path
or URL and adds them to the local repository.
If the pulled changes add a new branch head, the head is
automatically merged, and the result of the merge is committed.
Otherwise, the working directory is updated to include the new
changes.
When a merge occurs, the newly pulled changes are assumed to be
"authoritative". The head of the new changes is used as the first
parent, with local changes as the second. To switch the merge
order, use --switch-parent.
See :hg:`help dates` for a list of formats valid for -d/--date.
Returns 0 on success.
'''
date = opts.get('date')
if date:
opts['date'] = util.parsedate(date)
parent, p2 = repo.dirstate.parents()
branch = repo.dirstate.branch()
branchnode = repo.branchtags().get(branch)
if parent != branchnode:
raise util.Abort(
_('working dir not at branch tip '
'(use "hg update" to check out branch tip)'))
if p2 != nullid:
raise util.Abort(_('outstanding uncommitted merge'))
wlock = lock = None
try:
wlock = repo.wlock()
lock = repo.lock()
mod, add, rem, del_ = repo.status()[:4]
if mod or add or rem:
raise util.Abort(_('outstanding uncommitted changes'))
if del_:
raise util.Abort(_('working directory is missing some files'))
bheads = repo.branchheads(branch)
bheads = [head for head in bheads if len(repo[head].children()) == 0]
if len(bheads) > 1:
raise util.Abort(
_('multiple heads in this branch '
'(use "hg heads ." and "hg merge" to merge)'))
other = hg.repository(hg.remoteui(repo, opts), ui.expandpath(source))
ui.status(
_('pulling from %s\n') % url.hidepassword(ui.expandpath(source)))
revs = None
if opts['rev']:
try:
revs = [other.lookup(rev) for rev in opts['rev']]
except error.CapabilityError:
err = _("Other repository doesn't support revision lookup, "
"so a rev cannot be specified.")
raise util.Abort(err)
# Are there any changes at all?
modheads = repo.pull(other, heads=revs)
if modheads == 0:
return 0
# Is this a simple fast-forward along the current branch?
newheads = repo.branchheads(branch)
newchildren = repo.changelog.nodesbetween([parent], newheads)[2]
if len(newheads) == 1:
if newchildren[0] != parent:
return hg.clean(repo, newchildren[0])
else:
return 0
# Are there more than one additional branch heads?
newchildren = [n for n in newchildren if n != parent]
newparent = parent
if newchildren:
newparent = newchildren[0]
hg.clean(repo, newparent)
newheads = [n for n in newheads if n != newparent]
if len(newheads) > 1:
ui.status(
_('not merging with %d other new branch heads '
'(use "hg heads ." and "hg merge" to merge them)\n') %
(len(newheads) - 1))
return 1
# Otherwise, let's merge.
err = False
if newheads:
# By default, we consider the repository we're pulling
# *from* as authoritative, so we merge our changes into
# theirs.
if opts['switch_parent']:
firstparent, secondparent = newparent, newheads[0]
else:
firstparent, secondparent = newheads[0], newparent
ui.status(
_('updating to %d:%s\n') %
(repo.changelog.rev(firstparent), short(firstparent)))
hg.clean(repo, firstparent)
ui.status(
_('merging with %d:%s\n') %
(repo.changelog.rev(secondparent), short(secondparent)))
err = hg.merge(repo, secondparent, remind=False)
if not err:
# we don't translate commit messages
message = (cmdutil.logmessage(opts)
or ('Automated merge with %s' %
url.removeauth(other.url())))
editor = cmdutil.commiteditor
if opts.get('force_editor') or opts.get('edit'):
editor = cmdutil.commitforceeditor
n = repo.commit(message, opts['user'], opts['date'], editor=editor)
ui.status(
_('new changeset %d:%s merges remote changes '
'with local\n') % (repo.changelog.rev(n), short(n)))
return err
finally:
release(lock, wlock)
