Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 12130:48735ce02345

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin Geisler <mg@lazybytes.net>
date Wed, 01 Sep 2010 12:28:34 +0200
parents ff7c1118a83a 07ac2a560fce
children c061f9882ff7
comparison
equal deleted inserted replaced
12127:36a65283c3af 12130:48735ce02345
2796 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) 2796 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2797 if revs: 2797 if revs:
2798 try: 2798 try:
2799 revs = [other.lookup(rev) for rev in revs] 2799 revs = [other.lookup(rev) for rev in revs]
2800 except error.CapabilityError: 2800 except error.CapabilityError:
2801 err = _("Other repository doesn't support revision lookup, " 2801 err = _("other repository doesn't support revision lookup, "
2802 "so a rev cannot be specified.") 2802 "so a rev cannot be specified.")
2803 raise util.Abort(err) 2803 raise util.Abort(err)
2804 2804
2805 modheads = repo.pull(other, heads=revs, force=opts.get('force')) 2805 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2806 if checkout: 2806 if checkout:
2911 for f in m.files(): 2911 for f in m.files():
2912 if f not in repo.dirstate and not os.path.isdir(m.rel(f)): 2912 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2913 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) 2913 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2914 ret = 1 2914 ret = 1
2915 2915
2916 def warn(files, reason):
2917 for f in files:
2918 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2919 % (m.rel(f), reason))
2920 ret = 1
2921
2922 if force: 2916 if force:
2923 remove, forget = modified + deleted + clean, added 2917 remove, forget = modified + deleted + clean, added
2924 elif after: 2918 elif after:
2925 remove, forget = deleted, [] 2919 remove, forget = deleted, []
2926 warn(modified + added + clean, _('still exists')) 2920 for f in modified + added + clean:
2921 ui.warn(_('not removing %s: file still exists (use -f'
2922 ' to force removal)\n') % m.rel(f))
2923 ret = 1
2927 else: 2924 else:
2928 remove, forget = deleted + clean, [] 2925 remove, forget = deleted + clean, []
2929 warn(modified, _('is modified')) 2926 for f in modified:
2930 warn(added, _('has been marked for add')) 2927 ui.warn(_('not removing %s: file is modified (use -f'
2928 ' to force removal)\n') % m.rel(f))
2929 ret = 1
2930 for f in added:
2931 ui.warn(_('not removing %s: file has been marked for add (use -f'
2932 ' to force removal)\n') % m.rel(f))
2933 ret = 1
2931 2934
2932 for f in sorted(remove + forget): 2935 for f in sorted(remove + forget):
2933 if ui.verbose or not m.exact(f): 2936 if ui.verbose or not m.exact(f):
2934 ui.status(_('removing %s\n') % m.rel(f)) 2937 ui.status(_('removing %s\n') % m.rel(f))
2935 2938