hg-stable: comparison hgext/mq.py

equal deleted inserted replaced

-:defabf63e969
+:8ff1ecfadcd1
 pass
 elif self.gitmode in (b'yes', b'no'):
 diffopts.git = self.gitmode == b'yes'
 else:
 raise error.Abort(
-_(b'mq.git option can be auto/keep/yes/no' b' got %s')
+_(b'mq.git option can be auto/keep/yes/no got %s')
 % self.gitmode
 )
 if patchfn:
 diffopts = self.patchopts(diffopts, patchfn)
 return diffopts
 if update_status:
 self.applied.append(statusentry(n, patchname))
 if patcherr:
 self.ui.warn(
-_(b"patch failed, rejects left in working " b"directory\n")
+_(b"patch failed, rejects left in working directory\n")
 )
 err = 2
 break
 if fuzz and strict:
 phases.advanceboundary(repo, tr, tphase, qfinished)
 def delete(self, repo, patches, opts):
 if not patches and not opts.get(b'rev'):
 raise error.Abort(
-_(b'qdelete requires at least one revision or ' b'patch name')
+_(b'qdelete requires at least one revision or patch name')
 )
 realpatches = []
 for patch in patches:
 patch = self.lookup(patch, strict=True)
 _(b'"%s" cannot be used as the name of a patch') % name
 )
 if name != name.strip():
 # whitespace is stripped by parseseries()
 raise error.Abort(
-_(b'patch name cannot begin or end with ' b'whitespace')
+_(b'patch name cannot begin or end with whitespace')
 )
 for prefix in (b'.hg', b'.mq'):
 if name.startswith(prefix):
 raise error.Abort(
 _(b'patch name cannot begin with "%s"') % prefix
 raise error.Abort(
 _(b"cannot use --exact and --keep-changes together")
 )
 if move:
 raise error.Abort(
-_(b'cannot use --exact and --move ' b'together')
+_(b'cannot use --exact and --move together')
 )
 if self.applied:
 raise error.Abort(
-_(b'cannot push --exact with applied ' b'patches')
+_(b'cannot push --exact with applied patches')
 )
 root = self.series[start]
 target = patchheader(self.join(root), self.plainmode).parent
 if not target:
 raise error.Abort(
 )
 if rev:
 if files:
 raise error.Abort(
-_(b'option "-r" not valid when importing ' b'files')
+_(b'option "-r" not valid when importing files')
 )
 rev = scmutil.revrange(repo, rev)
 rev.sort(reverse=True)
 elif not files:
 raise error.Abort(_(b'no files or revisions specified'))
 if (len(files) > 1 or len(rev) > 1) and patchname:
 raise error.Abort(
-_(b'option "-n" not valid when importing multiple ' b'patches')
+_(b'option "-n" not valid when importing multiple patches')
 )
 imported = []
 if rev:
 # If mq patches are applied, we can only import revisions
 # that form a linear path to qbase.
 # Otherwise, they should form a linear path to a head.
 heads = repo.changelog.heads(repo.changelog.node(rev.first()))
 if len(heads) > 1:
 raise error.Abort(
-_(b'revision %d is the root of more than one ' b'branch')
+_(b'revision %d is the root of more than one branch')
 % rev.last()
 )
 if self.applied:
 base = repo.changelog.node(rev.first())
 if base in [n.node for n in self.applied]:
 raise error.Abort(
 _(b'revision %d is already managed') % rev.first()
 )
 if heads != [self.applied[-1].node]:
 raise error.Abort(
-_(b'revision %d is not the parent of ' b'the queue')
+_(b'revision %d is not the parent of the queue')
 % rev.first()
 )
 base = repo.changelog.rev(self.applied[0].node)
 lastparent = repo.changelog.parentrevs(base)[0]
 else:
 raise error.Abort(
 _(b'cannot import merge revision %d') % r
 )
 if lastparent and lastparent != r:
 raise error.Abort(
-_(b'revision %d is not the parent of ' b'%d')
+_(b'revision %d is not the parent of %d')
 % (r, lastparent)
 )
 lastparent = p1
 if not patchname:
 patchespath = patchdir(sr)
 try:
 hg.peer(ui, opts, patchespath)
 except error.RepoError:
 raise error.Abort(
-_(b'versioned patch repository not found' b' (see init --mq)')
+_(b'versioned patch repository not found (see init --mq)')
 )
 qbase, destrev = None, None
 if sr.local():
 repo = sr.local()
 if repo.mq.applied and repo[qbase].phase() != phases.secret:
 patch = None
 args = list(args)
 if opts.get(r'list'):
 if args or opts.get(r'none'):
 raise error.Abort(
-_(b'cannot mix -l/--list with options or ' b'arguments')
+_(b'cannot mix -l/--list with options or arguments')
 )
 for i in pycompat.xrange(len(q.series)):
 status(i)
 return
 if not args or args[0][0:1] in b'-+':
 if opts.get(b'name'):
 newpath = os.path.join(q.basepath, opts.get(b'name'))
 if os.path.exists(newpath):
 if not os.path.isdir(newpath):
 raise error.Abort(
-_(b'destination %s exists and is not ' b'a directory')
+_(b'destination %s exists and is not a directory')
 % newpath
 )
 if not opts.get(b'force'):
 raise error.Abort(
-_(b'destination %s exists, ' b'use -f to force')
+_(b'destination %s exists, use -f to force') % newpath
-% newpath
 )
 else:
 newpath = savename(path)
 ui.warn(_(b"copy %s to %s\n") % (path, newpath))
 util.copyfiles(path, newpath)
 mqtags.append((self.changelog.parents(mqtags[0][0])[0], b'qparent'))
 tags = result[0]
 for patch in mqtags:
 if patch[1] in tags:
 self.ui.warn(
-_(b'tag %s overrides mq patch of the same ' b'name\n')
+_(b'tag %s overrides mq patch of the same name\n')
 % patch[1]
 )
 else:
 tags[patch[1]] = patch[0]
 if args:
 repopath = args[0]
 if not hg.islocal(repopath):
 raise error.Abort(
-_(b'only a local queue repository ' b'may be initialized')
+_(b'only a local queue repository may be initialized')
 )
 else:
 repopath = cmdutil.findrepo(encoding.getcwd())
 if not repopath:
 raise error.Abort(
-_(b'there is no Mercurial repository here ' b'(.hg not found)')
+_(b'there is no Mercurial repository here (.hg not found)')
 )
 repo = hg.repository(ui, repopath)
 return qinit(ui, repo, True)

changeset 43117	8ff1ecfadcd1
parent 43105	649d3ac37a12
child 43421	be384a2052aa