mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:ff06fe0703ef
+:ceaa3fefc10c
 # is descending and the prune args are all within that range
 for rev in opts.get('prune', ()):
 rev = repo.changelog.rev(repo.lookup(rev))
 ff = followfilter()
 stop = min(revs[0], revs[-1])
-for x in range(rev, stop-1, -1):
+for x in xrange(rev, stop-1, -1):
 if ff.match(x) and wanted.has_key(x):
 del wanted[x]
 def iterate():
 if follow and not files:
 self.ui.write("%d:%s\n" % (rev, short(changenode)))
 return
 changes = log.read(changenode)
 date = util.datestr(changes[2])
-branch = changes[5].get("branch")
+extra = changes[5]
+branch = extra.get("branch")
 hexfunc = self.ui.debugflag and hex or short
 parents = [(log.rev(p), hexfunc(p)) for p in log.parents(changenode)
 if self.ui.debugflag or p != nullid]
 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
 files):
 if value:
 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
-else:
+elif changes[3]:
 self.ui.note(_("files:       %s\n") % " ".join(changes[3]))
 if copies:
 copies = ['%s (%s)' % c for c in copies]
 self.ui.note(_("copies:      %s\n") % ' '.join(copies))
+if extra and self.ui.debugflag:
+extraitems = extra.items()
+extraitems.sort()
+for key, value in extraitems:
+self.ui.debug(_("extra:       %s=%s\n")
+% (key, value.encode('string_escape')))
 description = changes[4].strip()
 if description:
 if self.ui.verbose:
 self.ui.status(_("description:\n"))
 def debugindex(ui, file_):
 """dump the contents of an index file"""
 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
 ui.write("   rev    offset  length   base linkrev" +
 " nodeid       p1           p2\n")
-for i in range(r.count()):
+for i in xrange(r.count()):
 node = r.node(i)
 pp = r.parents(node)
 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
 short(node), short(pp[0]), short(pp[1])))
 def debugindexdot(ui, file_):
 """dump an index DAG as a .dot file"""
 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
 ui.write("digraph G {\n")
-for i in range(r.count()):
+for i in xrange(r.count()):
 node = r.node(i)
 pp = r.parents(node)
 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
 if pp[1] != nullid:
 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
 def difflinestates(a, b):
 sm = difflib.SequenceMatcher(None, a, b)
 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
 if tag == 'insert':
-for i in range(blo, bhi):
+for i in xrange(blo, bhi):
 yield ('+', b[i])
 elif tag == 'delete':
-for i in range(alo, ahi):
+for i in xrange(alo, ahi):
 yield ('-', a[i])
 elif tag == 'replace':
-for i in range(alo, ahi):
+for i in xrange(alo, ahi):
 yield ('-', a[i])
-for i in range(blo, bhi):
+for i in xrange(blo, bhi):
 yield ('+', b[i])
 prev = {}
 ucache = {}
 def display(fn, rev, states, prevstates):
 else:
 # launch the editor
 message = None
 ui.debug(_('message:\n%s\n') % message)
-files, fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root)
+files = {}
-files = patch.updatedir(ui, repo, files, wlock=wlock)
+try:
+fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
+files=files)
+finally:
+files = patch.updatedir(ui, repo, files, wlock=wlock)
 repo.commit(files, message, user, date, wlock=wlock, lock=lock)
 finally:
 os.unlink(tmpname)
 def incoming(ui, repo, source="default", **opts):
 and a copy of hg in the remote path or specified with as remotecmd.
 - path is relative to the remote user's home directory by default.
 Use an extra slash at the start of a path to specify an absolute path:
 ssh://example.com//tmp/repository
 - Mercurial doesn't use its own compression via SSH; the right thing
-to do is to configure it in your ~/.ssh/ssh_config, e.g.:
+to do is to configure it in your ~/.ssh/config, e.g.:
 Host *.mylocalnetwork.example.com
-Compression off
+Compression no
 Host *
-Compression on
+Compression yes
 Alternatively specify "ssh -C" as your ssh command in your hgrc or
 with the --ssh command line option.
 """
 source = ui.expandpath(source)
 setremoteconfig(ui, opts)
 Show status of files in the repository.  If names are given, only
 files that match are shown.  Files that are clean or ignored, are
 not listed unless -c (clean), -i (ignored) or -A is given.
+If one revision is given, it is used as the base revision.
+If two revisions are given, the difference between them is shown.
 The codes used to show the status of files are:
 M = modified
 A = added
 R = removed
 C = clean
 I = ignored (not shown by default)
 = the previous added file was copied from here
 """
 all = opts['all']
+node1, node2 = cmdutil.revpair(ui, repo, opts.get('rev'))
 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
 cwd = (pats and repo.getcwd()) or ''
 modified, added, removed, deleted, unknown, ignored, clean = [
 [util.pathto(cwd, x) for x in n]
-for n in repo.status(files=files, match=matchfn,
+for n in repo.status(node1=node1, node2=node2, files=files,
+match=matchfn,
 list_ignored=all or opts['ignored'],
 list_clean=all or opts['clean'])]
 changetypes = (('modified', 'M', modified),
 ('added', 'A', added),
 ('i', 'ignored', None, _('show ignored files')),
 ('n', 'no-status', None, _('hide status prefix')),
 ('C', 'copies', None, _('show source of copied files')),
 ('0', 'print0', None,
 _('end filenames with NUL, for use with xargs')),
+('', 'rev', [], _('show difference from revision')),
 ] + walkopts,
 _('hg status [OPTION]... [FILE]...')),
 "tag":
 (tag,
 [('l', 'local', None, _('make the tag local')),

changeset 3499	ceaa3fefc10c
parent 3467	df7202f6887c
child 3502	8dc14d630b29