Mercurial > hg
changeset 3490:ceaa3fefc10c
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 24 Oct 2006 13:46:04 -0500 |
| parents | ff06fe0703ef (diff) c3345b0f2fcd (current diff) |
| children | bd8339976504 |
| files | mercurial/localrepo.py mercurial/revlog.py |
| diffstat | 5 files changed, 72 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Mon Oct 23 14:56:51 2006 +0200 +++ b/mercurial/context.py Tue Oct 24 13:46:04 2006 -0500 @@ -151,7 +151,10 @@ if '_fileid' in self.__dict__: self._filenode = self._filelog.lookup(self._fileid) else: - self._filenode = self._changectx.filenode(self._path) + try: + self._filenode = self._changectx.filenode(self._path) + except: + self._filenode = self._filerev = None except revlog.RevlogError, inst: raise repo.LookupError(str(inst)) return self._filenode @@ -162,7 +165,7 @@ raise AttributeError, name def __nonzero__(self): - return self._filerev != nullid + return self._filenode != None def __str__(self): return "%s@%s" % (self.path(), short(self.node()))
--- a/mercurial/localrepo.py Mon Oct 23 14:56:51 2006 +0200 +++ b/mercurial/localrepo.py Tue Oct 24 13:46:04 2006 -0500 @@ -47,6 +47,7 @@ self.origroot = path self.ui = ui.ui(parentui=parentui) self.opener = util.opener(self.path) + self.sopener = util.opener(self.path) self.wopener = util.opener(self.root) try: @@ -66,8 +67,8 @@ flags = revlog.REVLOG_DEFAULT_FLAGS v = self.revlogversion | flags - self.manifest = manifest.manifest(self.opener, v) - self.changelog = changelog.changelog(self.opener, v) + self.manifest = manifest.manifest(self.sopener, v) + self.changelog = changelog.changelog(self.sopener, v) # the changelog might not have the inline index flag # on. If the format of the changelog is the same as found in @@ -245,17 +246,16 @@ # taking precedence heads = self.heads() heads.reverse() - fl = self.file(".hgtags") + seen = {} for node in heads: - change = self.changelog.read(node) - rev = self.changelog.rev(node) - fn, ff = self.manifest.find(change[0], '.hgtags') - if fn is None: continue + f = self.filectx('.hgtags', node) + if not f or f.filerev() in seen: continue + seen[f.filerev()] = 1 count = 0 - for l in fl.read(fn).splitlines(): + for l in f.data().splitlines(): count += 1 - parsetag(l, _(".hgtags (rev %d:%s), line %d") % - (rev, short(node), count)) + parsetag(l, _("%s, line %d") % (str(f), count)) + try: f = self.opener("localtags") count = 0 @@ -336,14 +336,17 @@ key = self.dirstate.parents()[0] if key == nullid: raise repo.RepoError(_("no revision checked out")) + n = self.changelog._match(key) + if n: + return n if key in self.tags(): return self.tags()[key] if key in self.branchtags(): return self.branchtags()[key] - try: - return self.changelog.lookup(key) - except: - raise repo.RepoError(_("unknown revision '%s'") % key) + n = self.changelog._partialmatch(key) + if n: + return n + raise repo.RepoError(_("unknown revision '%s'") % key) def dev(self): return os.lstat(self.path).st_dev @@ -354,13 +357,16 @@ def join(self, f): return os.path.join(self.path, f) + def sjoin(self, f): + return os.path.join(self.path, f) + def wjoin(self, f): return os.path.join(self.root, f) def file(self, f): if f[0] == '/': f = f[1:] - return filelog.filelog(self.opener, f, self.revlogversion) + return filelog.filelog(self.sopener, f, self.revlogversion) def changectx(self, changeid=None): return context.changectx(self, changeid) @@ -440,17 +446,17 @@ ds = "" self.opener("journal.dirstate", "w").write(ds) - tr = transaction.transaction(self.ui.warn, self.opener, - self.join("journal"), + tr = transaction.transaction(self.ui.warn, self.sopener, + self.sjoin("journal"), aftertrans(self.path)) self.transhandle = tr return tr def recover(self): l = self.lock() - if os.path.exists(self.join("journal")): + if os.path.exists(self.sjoin("journal")): self.ui.status(_("rolling back interrupted transaction\n")) - transaction.rollback(self.opener, self.join("journal")) + transaction.rollback(self.sopener, self.sjoin("journal")) self.reload() return True else: @@ -461,9 +467,9 @@ if not wlock: wlock = self.wlock() l = self.lock() - if os.path.exists(self.join("undo")): + if os.path.exists(self.sjoin("undo")): self.ui.status(_("rolling back last transaction\n")) - transaction.rollback(self.opener, self.join("undo")) + transaction.rollback(self.sopener, self.sjoin("undo")) util.rename(self.join("undo.dirstate"), self.join("dirstate")) self.reload() self.wreload() @@ -482,26 +488,25 @@ def do_lock(self, lockname, wait, releasefn=None, acquirefn=None, desc=None): try: - l = lock.lock(self.join(lockname), 0, releasefn, desc=desc) + l = lock.lock(lockname, 0, releasefn, desc=desc) except lock.LockHeld, inst: if not wait: raise self.ui.warn(_("waiting for lock on %s held by %s\n") % (desc, inst.args[0])) # default to 600 seconds timeout - l = lock.lock(self.join(lockname), - int(self.ui.config("ui", "timeout") or 600), + l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), releasefn, desc=desc) if acquirefn: acquirefn() return l def lock(self, wait=1): - return self.do_lock("lock", wait, acquirefn=self.reload, + return self.do_lock(self.sjoin("lock"), wait, acquirefn=self.reload, desc=_('repository %s') % self.origroot) def wlock(self, wait=1): - return self.do_lock("wlock", wait, self.dirstate.write, + return self.do_lock(self.join("wlock"), wait, self.dirstate.write, self.wreload, desc=_('working directory of %s') % self.origroot) @@ -1684,7 +1689,8 @@ # inconsistent view cl = None try: - cl = appendfile.appendchangelog(self.opener, self.changelog.version) + cl = appendfile.appendchangelog(self.sopener, + self.changelog.version) oldheads = len(cl.heads()) @@ -1727,7 +1733,8 @@ cl.cleanup() # make changelog see real files again - self.changelog = changelog.changelog(self.opener, self.changelog.version) + self.changelog = changelog.changelog(self.sopener, + self.changelog.version) self.changelog.checkinlinesize(tr) newheads = len(self.changelog.heads()) @@ -1771,7 +1778,7 @@ name, size = fp.readline().split('\0', 1) size = int(size) self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size))) - ofp = self.opener(name, 'w') + ofp = self.sopener(name, 'w') for chunk in util.filechunkiter(fp, limit=size): ofp.write(chunk) ofp.close()
--- a/mercurial/revlog.py Mon Oct 23 14:56:51 2006 +0200 +++ b/mercurial/revlog.py Tue Oct 24 13:46:04 2006 -0500 @@ -742,11 +742,7 @@ c.append(self.node(r)) return c - def lookup(self, id): - """locate a node based on: - - revision number or str(revision number) - - nodeid or subset of hex nodeid - """ + def _match(self, id): if isinstance(id, (long, int)): # rev return self.node(id) @@ -768,13 +764,18 @@ return self.node(rev) except (ValueError, OverflowError): pass - try: - if len(id) == 40: + if len(id) == 40: + try: # a full hex nodeid? node = bin(id) r = self.rev(node) return node - elif len(id) < 40: + except TypeError: + pass + + def _partialmatch(self, id): + if len(id) < 40: + try: # hex(node)[:...] bin_id = bin(id[:len(id) & ~1]) # grab an even number of digits node = None @@ -785,8 +786,21 @@ node = n if node is not None: return node - except TypeError: - pass + except TypeError: + pass + + def lookup(self, id): + """locate a node based on: + - revision number or str(revision number) + - nodeid or subset of hex nodeid + """ + + n = self._match(id) + if n is not None: + return n + n = self._partialmatch(id) + if n: + return n raise RevlogError(_("No match found"))
--- a/mercurial/statichttprepo.py Mon Oct 23 14:56:51 2006 +0200 +++ b/mercurial/statichttprepo.py Tue Oct 24 13:46:04 2006 -0500 @@ -36,6 +36,7 @@ self.ui = ui self.revlogversion = 0 self.opener = opener(self.path) + self.sopener = opener(self.path) self.manifest = manifest.manifest(self.opener) self.changelog = changelog.changelog(self.opener) self.tagscache = None
--- a/tests/test-tags.out Mon Oct 23 14:56:51 2006 +0200 +++ b/tests/test-tags.out Tue Oct 24 13:46:04 2006 -0500 @@ -18,20 +18,17 @@ M .hgtags tip 6:e2174d339386 first 0:0acdaf898367 -.hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry -.hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed -localtags, line 1: tag 'invalid' refers to unknown node 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -.hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry -.hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed -.hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed +.hgtags@c071f74ab5eb, line 2: cannot parse entry +.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed +.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed localtags, line 1: tag 'invalid' refers to unknown node tip 8:4ca6f1b1a68c first 0:0acdaf898367 changeset: 8:4ca6f1b1a68c -.hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry -.hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed -.hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed +.hgtags@c071f74ab5eb, line 2: cannot parse entry +.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed +.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed localtags, line 1: tag 'invalid' refers to unknown node tag: tip parent: 3:b2ef3841386b