Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 11342:aecabad8dd7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: get rid of generic exception in debugbuilddag
author Martin Geisler <mg@aragost.com>
date Tue, 15 Jun 2010 09:53:50 +0200
parents 285bcf40e04b
children f2b25e8ea6c1
comparison
equal deleted inserted replaced
11341:920a783e5f91 11342:aecabad8dd7a
887 Note that the --overwritten-file and --appended-file options imply the 887 Note that the --overwritten-file and --appended-file options imply the
888 use of "HGMERGE=internal:local" during DAG buildup. 888 use of "HGMERGE=internal:local" during DAG buildup.
889 """ 889 """
890 890
891 if not (mergeable_file or appended_file or overwritten_file or new_file): 891 if not (mergeable_file or appended_file or overwritten_file or new_file):
892 raise Exception(_('need at least one of -m, -a, -o, -n')) 892 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
893 893
894 if len(repo.changelog) > 0: 894 if len(repo.changelog) > 0:
895 raise Exception(_('repository is not empty')) 895 raise util.Abort(_('repository is not empty'))
896 896
897 if overwritten_file or appended_file: 897 if overwritten_file or appended_file:
898 # we don't want to fail in merges during buildup 898 # we don't want to fail in merges during buildup
899 os.environ['HGMERGE'] = 'internal:local' 899 os.environ['HGMERGE'] = 'internal:local'
900 900