equal
deleted
inserted
replaced
959 hg book -f @ |
959 hg book -f @ |
960 ''' |
960 ''' |
961 opts = pycompat.byteskwargs(opts) |
961 opts = pycompat.byteskwargs(opts) |
962 force = opts.get('force') |
962 force = opts.get('force') |
963 rev = opts.get('rev') |
963 rev = opts.get('rev') |
964 rename = opts.get('rename') |
|
965 inactive = opts.get('inactive') |
964 inactive = opts.get('inactive') |
966 |
965 |
967 selactions = [k for k in ['delete', 'rename', 'active'] if opts.get(k)] |
966 selactions = [k for k in ['delete', 'rename', 'active'] if opts.get(k)] |
968 if len(selactions) > 1: |
967 if len(selactions) > 1: |
969 raise error.Abort(_('--%s and --%s are incompatible') |
968 raise error.Abort(_('--%s and --%s are incompatible') |
990 elif action == 'rename': |
989 elif action == 'rename': |
991 if not names: |
990 if not names: |
992 raise error.Abort(_("new bookmark name required")) |
991 raise error.Abort(_("new bookmark name required")) |
993 elif len(names) > 1: |
992 elif len(names) > 1: |
994 raise error.Abort(_("only one new bookmark name allowed")) |
993 raise error.Abort(_("only one new bookmark name allowed")) |
995 rename = repo._bookmarks.expandname(rename) |
994 oldname = repo._bookmarks.expandname(opts['rename']) |
996 bookmarks.rename(repo, tr, rename, names[0], force, inactive) |
995 bookmarks.rename(repo, tr, oldname, names[0], force, inactive) |
997 elif names: |
996 elif names: |
998 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
997 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
999 elif inactive: |
998 elif inactive: |
1000 if len(repo._bookmarks) == 0: |
999 if len(repo._bookmarks) == 0: |
1001 ui.status(_("no bookmarks set\n")) |
1000 ui.status(_("no bookmarks set\n")) |