Patchwork [2,of,5,wc] commands: say "working directory" in full spelling

login
register
mail settings
Submitter Yuya Nishihara
Date March 17, 2015, 3:09 p.m.
Message ID <3ec4a65651923f35581b.1426604963@mimosa>
Download mbox | patch
Permalink /patch/8119/
State Accepted
Commit f1eaf03dd608c032478f16e703a9cd003e32835d
Headers show

Comments

Yuya Nishihara - March 17, 2015, 3:09 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1426596797 -32400
#      Tue Mar 17 21:53:17 2015 +0900
# Node ID 3ec4a65651923f35581bbd083ac54aa816a27d9e
# Parent  c750fbabda7e0b4defccb13eb2abe6204d4cc89f
commands: say "working directory" in full spelling

Patch

diff --git a/hgext/fetch.py b/hgext/fetch.py
--- a/hgext/fetch.py
+++ b/hgext/fetch.py
@@ -56,7 +56,7 @@  def fetch(ui, repo, source='default', **
     except error.RepoLookupError:
         branchnode = None
     if parent != branchnode:
-        raise util.Abort(_('working dir not at branch tip '
+        raise util.Abort(_('working directory not at branch tip '
                            '(use "hg update" to check out branch tip)'))
 
     wlock = lock = None
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -930,7 +930,8 @@  class queue(object):
                 self.applied.append(statusentry(n, patchname))
 
             if patcherr:
-                self.ui.warn(_("patch failed, rejects left in working dir\n"))
+                self.ui.warn(_("patch failed, rejects left in working "
+                               "directory\n"))
                 err = 2
                 break
 
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -342,9 +342,8 @@  class transplanter(object):
         try:
             p1, p2 = repo.dirstate.parents()
             if p1 != parent:
-                raise util.Abort(
-                    _('working dir not at transplant parent %s') %
-                                 revlog.hex(parent))
+                raise util.Abort(_('working directory not at transplant '
+                                   'parent %s') % revlog.hex(parent))
             if merge:
                 repo.setparents(p1, parents[1])
             modified, added, removed, deleted = repo.status()[:4]
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1386,7 +1386,7 @@  def clone(ui, source, dest=None, **opts)
      _('mark new/missing files as added/removed before committing')),
     ('', 'close-branch', None,
      _('mark a branch as closed, hiding it from the branch list')),
-    ('', 'amend', None, _('amend the parent of the working dir')),
+    ('', 'amend', None, _('amend the parent of the working directory')),
     ('s', 'secret', None, _('use the secret phase for committing')),
     ('e', 'edit', None, _('invoke editor on commit messages')),
     ('i', 'interactive', None, _('use interactive mode')),
diff --git a/tests/test-fetch.t b/tests/test-fetch.t
--- a/tests/test-fetch.t
+++ b/tests/test-fetch.t
@@ -339,7 +339,7 @@  pull in change on different branch than 
   marked working directory as branch topic
   (branches are permanent and global, did you want a bookmark?)
   $ hg -R n2 fetch -m merge n1
-  abort: working dir not at branch tip (use "hg update" to check out branch tip)
+  abort: working directory not at branch tip (use "hg update" to check out branch tip)
   [255]
 
 parent should be 0 (fetch did not update or merge anything)
diff --git a/tests/test-mq-eol.t b/tests/test-mq-eol.t
--- a/tests/test-mq-eol.t
+++ b/tests/test-mq-eol.t
@@ -60,7 +60,7 @@  should fail in strict mode
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file a.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh eol.diff
   [2]
   $ hg qpop
@@ -72,7 +72,7 @@  invalid eol
   $ hg --config patch.eol='LFCR' qpush
   applying eol.diff
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh eol.diff
   [2]
   $ hg qpop
@@ -169,7 +169,7 @@  Test .rej file EOL are left unchanged
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file a.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh patch1
   [2]
   $ hg qpop
@@ -192,7 +192,7 @@  Test .rej file EOL are left unchanged
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file a.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh patch1
   [2]
   $ hg qpop
diff --git a/tests/test-mq-missingfiles.t b/tests/test-mq-missingfiles.t
--- a/tests/test-mq-missingfiles.t
+++ b/tests/test-mq-missingfiles.t
@@ -44,7 +44,7 @@  Push patch with missing target:
   unable to find 'b' for patching
   2 out of 2 hunks FAILED -- saving rejects to file b.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh changeb
   [2]
 
@@ -97,7 +97,7 @@  Test missing renamed file
   2 out of 2 hunks FAILED -- saving rejects to file bb.rej
   b not tracked!
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh changebb
   [2]
   $ cat a
@@ -149,7 +149,7 @@  Push git patch with missing target:
   unable to find 'b' for patching
   1 out of 1 hunks FAILED -- saving rejects to file b.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh changeb
   [2]
   $ hg st
diff --git a/tests/test-mq-qpush-exact.t b/tests/test-mq-qpush-exact.t
--- a/tests/test-mq-qpush-exact.t
+++ b/tests/test-mq-qpush-exact.t
@@ -203,7 +203,7 @@  qpush --exact --force with changes to a 
   file fp0 already exists
   1 out of 1 hunks FAILED -- saving rejects to file fp0.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh p0
   [2]
   $ cat fp0
@@ -230,7 +230,7 @@  qpush --exact --force with changes to a 
   file fp1 already exists
   1 out of 1 hunks FAILED -- saving rejects to file fp1.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh p1
   [2]
   $ cat fp1
diff --git a/tests/test-mq-qpush-fail.t b/tests/test-mq-qpush-fail.t
--- a/tests/test-mq-qpush-fail.t
+++ b/tests/test-mq-qpush-fail.t
@@ -284,7 +284,7 @@  test qpush --force and backup files
   b
   committing manifest
   committing changelog
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh p3
   [2]
   $ cat a.orig
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -870,7 +870,7 @@  qpush failure
   file foo already exists
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  patch failed, rejects left in working directory
   errors during apply, please fix and refresh bar
   [2]
   $ hg st
diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t
--- a/tests/test-qrecord.t
+++ b/tests/test-qrecord.t
@@ -60,7 +60,7 @@  help record (record)
                             committing
       --close-branch        mark a branch as closed, hiding it from the branch
                             list
-      --amend               amend the parent of the working dir
+      --amend               amend the parent of the working directory
    -s --secret              use the secret phase for committing
    -e --edit                invoke editor on commit messages
    -I --include PATTERN [+] include names matching the given patterns
diff --git a/tests/test-record.t b/tests/test-record.t
--- a/tests/test-record.t
+++ b/tests/test-record.t
@@ -47,7 +47,7 @@  Record help
                             committing
       --close-branch        mark a branch as closed, hiding it from the branch
                             list
-      --amend               amend the parent of the working dir
+      --amend               amend the parent of the working directory
    -s --secret              use the secret phase for committing
    -e --edit                invoke editor on commit messages
    -I --include PATTERN [+] include names matching the given patterns