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

equal deleted inserted replaced

-:f29857aaa053
+:23012d48ae91
 revs.reverse()
 for rev in revs:
 yield rev
 minrev, maxrev = min(revs), max(revs)
-for file in files:
+for file_ in files:
-filelog = repo.file(file)
+filelog = repo.file(file_)
 # A zero count may be a directory or deleted file, so
 # try to find matching entries on the slow path.
 if filelog.count() == 0:
 slowpath = True
 break
 for rev in filerevgen(filelog):
 if rev <= maxrev:
 if rev < minrev:
 break
 fncache.setdefault(rev, [])
-fncache[rev].append(file)
+fncache[rev].append(file_)
 wanted[rev] = 1
 if slowpath:
 # The slow path checks files modified in every changeset.
 def changerevgen():
 for i in xrange(repo.changelog.count() - 1, -1, -window):
 if cmd == "shortlist" and not f.startswith("^"):
 continue
 f = f.lstrip("^")
 if not ui.debugflag and f.startswith("debug"):
 continue
-d = ""
 doc = e[0].__doc__
 if not doc:
 doc = _("(No help text available)")
 h[f] = doc.splitlines(0)[0].rstrip()
 cmds[f] = c.lstrip("^")
 try:
 # we use a lock here because if we race with commit, we
 # can end up with extra data in the cloned revlogs that's
 # not pointed to by changesets, thus causing verify to
 # fail
-l1 = lock.lock(os.path.join(source, ".hg", "lock"))
+l1 = other.lock()
-except OSError:
+except lock.LockException:
 copy = False
 if copy:
 # we lock here to avoid premature writing to the target
 os.mkdir(os.path.join(dest, ".hg"))
 """find the ancestor revision of two revisions in a given index"""
 r = revlog.revlog(util.opener(os.getcwd()), index, "")
 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
+def debugrebuildstate(ui, repo, rev=None):
+"""rebuild the dirstate as it would look like for the given revision"""
+if not rev:
+rev = repo.changelog.tip()
+else:
+rev = repo.lookup(rev)
+change = repo.changelog.read(rev)
+n = change[0]
+files = repo.manifest.readflags(n)
+wlock = self.repo.wlock()
+repo.dirstate.rebuild(rev, files.iteritems())
 def debugcheckstate(ui, repo):
 """validate the correctness of the current dirstate"""
 parent1, parent2 = repo.dirstate.parents()
 repo.dirstate.read()
 dc = repo.dirstate.map
 m = matches[rev][fn]
 for lnum, cstart, cend, line in matchlines(body):
 s = linestate(line, lnum, cstart, cend)
 m[s] = s
+# FIXME: prev isn't used, why ?
 prev = {}
 ucache = {}
 def display(fn, rev, states, prevstates):
 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
 ('A', 'after', None, _('record a copy that has already occurred')),
 ('f', 'force', None,
 _('forcibly copy over an existing managed file'))],
 _('hg copy [OPTION]... [SOURCE]... DEST')),
 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
+"debugrebuildstate":
+(debugrebuildstate,
+[('r', 'rev', "", _("revision to rebuild to"))],
+_('debugrebuildstate [-r REV] [REV]')),
 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
 "debugconfig": (debugconfig, [], _('debugconfig')),
 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
 "debugstate": (debugstate, [], _('debugstate')),
 "debugdata": (debugdata, [], _('debugdata FILE REV')),

changeset 1757	23012d48ae91
parent 1756	f29857aaa053
parent 1755	a8f7791e3680
child 1761	7eb1934f83fb