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

equal deleted inserted replaced

-:0cd2ee61b10a
+:01215ad04283
 demandload(globals(), "errno socket version struct atexit")
 class UnknownCommand(Exception):
 """Exception raised if command is not in the command table."""
-class Abort(Exception):
-"""Raised if a command needs to print an error and exit."""
 def filterfiles(filters, files):
 l = [x for x in files if x in filters]
 for t in filters:
 if t and t[-1] != "/":
 return files
 def relpath(repo, args):
 cwd = repo.getcwd()
 if cwd:
-return [util.pconvert(os.path.normpath(os.path.join(cwd, x)))
+return [util.normpath(os.path.join(cwd, x)) for x in args]
-for x in args]
 return args
-def matchpats(cwd, pats = [], opts = {}, head = ''):
+def matchpats(repo, cwd, pats = [], opts = {}, head = ''):
-return util.matcher(cwd, pats or ['.'], opts.get('include'),
+return util.matcher(repo, cwd, pats or ['.'], opts.get('include'),
 opts.get('exclude'), head)
-def pathto(n1, n2):
-'''return the relative path from one place to another'''
-if not n1: return n2
-a, b = n1.split(os.sep), n2.split(os.sep)
-a.reverse(), b.reverse()
-while a and b and a[-1] == b[-1]:
-a.pop(), b.pop()
-b.reverse()
-return os.sep.join((['..'] * len(a)) + b)
 def makewalk(repo, pats, opts, head = ''):
 cwd = repo.getcwd()
-files, matchfn = matchpats(cwd, pats, opts, head)
+files, matchfn = matchpats(repo, cwd, pats, opts, head)
 def walk():
 for src, fn in repo.walk(files = files, match = matchfn):
-yield src, fn, pathto(cwd, fn)
+yield src, fn, util.pathto(cwd, fn)
 return files, matchfn, walk()
 def walk(repo, pats, opts, head = ''):
 files, matchfn, results = makewalk(repo, pats, opts, head)
 for r in results: yield r
 num = repo.changelog.rev(repo.lookup(val))
 except KeyError:
 try:
 num = revlog.rev(revlog.lookup(val))
 except KeyError:
-raise Abort('invalid revision identifier %s', val)
+raise util.Abort('invalid revision identifier %s', val)
 return num
 for spec in revs:
 if spec.find(revrangesep) >= 0:
 start, end = spec.split(revrangesep, 1)
 start = fix(start, 0)
 c = expander[c]()
 newname.append(c)
 i += 1
 return ''.join(newname)
 except KeyError, inst:
-raise Abort("invalid format spec '%%%s' in output file name",
+raise util.Abort("invalid format spec '%%%s' in output file name",
 inst.args[0])
 def make_file(repo, r, pat, node=None,
 total=None, seqno=None, revwidth=None, mode='wb'):
 if not pat or pat == '-':
 def addremove(ui, repo, *pats, **opts):
 """add all new files, delete all missing files"""
 q = dict(zip(pats, pats))
 add, remove = [], []
 for src, abs, rel in walk(repo, pats, opts):
-if src == 'f':
+if src == 'f' and repo.dirstate.state(abs) == '?':
-if repo.dirstate.state(abs) == '?':
+add.append(abs)
-add.append(abs)
+if rel not in q: ui.status('adding ', rel, '\n')
-if rel not in q: ui.status('adding ', rel, '\n')
+if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
-elif repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
 remove.append(abs)
 if rel not in q: ui.status('removing ', rel, '\n')
 repo.add(add)
 repo.remove(remove)
 name = name[f+1:]
 bcache[rev] = name
 return name
 if not pats:
-raise Abort('at least one file name or pattern required')
+raise util.Abort('at least one file name or pattern required')
 bcache = {}
 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
 if not opts['user'] and not opts['changeset']:
 opts['number'] = 1
 dest = os.path.basename(os.path.normpath(source))
 if os.path.exists(dest):
 ui.warn("abort: destination '%s' already exists\n" % dest)
 return 1
+dest = os.path.realpath(dest)
 class Dircleanup:
 def __init__(self, dir_):
 self.rmtree = shutil.rmtree
 self.dir_ = dir_
 addremove(ui, repo, *pats, **opts)
 cwd = repo.getcwd()
 if not pats and cwd:
 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
-fns, match = matchpats((pats and repo.getcwd()) or '', pats, opts)
+fns, match = matchpats(repo, (pats and repo.getcwd()) or '', pats, opts)
 if pats:
 c, a, d, u = repo.changes(files = fns, match = match)
 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
 else:
 files = []
 state = repo.dirstate.state(f)
 if state not in "nrm":
 ui.warn("%s in manifest1, but listed as state %s" % (f, state))
 errors += 1
 if errors:
-raise Abort(".hg/dirstate inconsistent with current parent's manifest")
+raise util.Abort(".hg/dirstate inconsistent with current parent's manifest")
 def debugstate(ui, repo):
 """show the contents of the current dirstate"""
 repo.dirstate.read()
 dc = repo.dirstate.map
 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
 ui.write("}\n")
 def debugwalk(ui, repo, *pats, **opts):
 items = list(walk(repo, pats, opts))
+if not items: return
 fmt = '%%s  %%-%ds  %%s' % max([len(abs) for (src, abs, rel) in items])
 for i in items: print fmt % i
 def diff(ui, repo, *pats, **opts):
 """diff working directory (or selected files)"""
 revs = []
 if opts['rev']:
 revs = map(lambda x: repo.lookup(x), opts['rev'])
 if len(revs) > 2:
-raise Abort("too many revisions to diff")
+raise util.Abort("too many revisions to diff")
 files = []
-roots, match, results = makewalk(repo, pats, opts)
+match = util.always
-for src, abs, rel in results:
+if pats:
-files.append(abs)
+roots, match, results = makewalk(repo, pats, opts)
+for src, abs, rel in results:
+files.append(abs)
 dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
 node = repo.lookup(changeset)
 prev, other = repo.changelog.parents(node)
 if fp != sys.stdout: fp.close()
 def export(ui, repo, *changesets, **opts):
 """dump the header and diffs for one or more changesets"""
 if not changesets:
-raise Abort("export requires at least one changeset")
+raise util.Abort("export requires at least one changeset")
 seqno = 0
 revs = list(revrange(ui, repo, changesets))
 total = len(revs)
 revwidth = max(len(revs[0]), len(revs[-1]))
 ui.note(len(revs) > 1 and "Exporting patches:\n" or "Exporting patch:\n")
 pf = l[14:]
 if pf not in files:
 files.append(pf)
 patcherr = f.close()
 if patcherr:
-raise Abort("patch failed")
+raise util.Abort("patch failed")
 if len(files) > 0:
 addremove(ui, repo, *files)
 repo.commit(files, message, user)
 def init(ui, source=None):
 """create a new repository in the current directory"""
 if source:
-raise Abort("no longer supported: use \"hg clone\" instead")
+raise util.Abort("no longer supported: use \"hg clone\" instead")
 hg.repository(ui, ".", create=1)
 def locate(ui, repo, *pats, **opts):
 """locate files matching specific patterns"""
 end = '\n'
 R = removed
 ? = not tracked
 '''
 cwd = repo.getcwd()
-files, matchfn = matchpats(cwd, pats, opts)
+files, matchfn = matchpats(repo, cwd, pats, opts)
-(c, a, d, u) = [[pathto(cwd, x) for x in n]
+(c, a, d, u) = [[util.pathto(cwd, x) for x in n]
 for n in repo.changes(files=files, match=matchfn)]
 changetypes = [('modified', 'M', c),
 ('added', 'A', a),
 ('removed', 'R', d),
 return d()
 except:
 if options['traceback']:
 traceback.print_exc()
 raise
-except util.CommandError, inst:
-u.warn("abort: %s\n" % inst.args)
 except hg.RepoError, inst:
 u.warn("abort: ", inst, "!\n")
 except SignalInterrupt:
 u.warn("killed!\n")
 except KeyboardInterrupt:
 except OSError, inst:
 if hasattr(inst, "filename"):
 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
 else:
 u.warn("abort: %s\n" % inst.strerror)
-except Abort, inst:
+except util.Abort, inst:
 u.warn('abort: ', inst.args[0] % inst.args[1:], '\n')
 sys.exit(1)
 except TypeError, inst:
 # was this an argument error?
 tb = traceback.extract_tb(sys.exc_info()[2])

changeset 896	01215ad04283
parent 852	1df0983eb589
parent 895	77b52b864249
child 898	3616c0d7ab88