# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-02-06 23:35:25
# Node ID 59025c9b3540fa2a7b15ba703b954827f44fd030
# Parent  e67a85e0f19e564e0148df2e855b73e1ef5b4daf

subrepo: always show relative path to .orig backup

Same as previous commit, but for subrepo.

Differential Revision: https://phab.mercurial-scm.org/D5873

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -1830,7 +1830,7 @@ class gitsubrepo(abstractsubrepo):
             for name in names:
                 bakname = scmutil.origpath(self.ui, self._subparent, name)
                 self.ui.note(_('saving current version of %s as %s\n') %
-                        (name, bakname))
+                        (name, os.path.relpath(bakname)))
                 name = self.wvfs.join(name)
                 origvfs.rename(name, bakname)
 
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -925,7 +925,7 @@ revert moves orig files to the right pla
   $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
   reverting subrepo ../gitroot
   creating directory: $TESTTMP/tc/.hg/origbackups
-  saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar
+  saving current version of foobar as .hg/origbackups/foobar
   $ ls .hg/origbackups
   foobar
   $ rm -rf .hg/origbackups