equal
deleted
inserted
replaced
182 # instead of cwd. Detect that case, and provide a hint to the user. |
182 # instead of cwd. Detect that case, and provide a hint to the user. |
183 hint = None |
183 hint = None |
184 try: |
184 try: |
185 if cwd != root: |
185 if cwd != root: |
186 canonpath(root, root, myname, auditor) |
186 canonpath(root, root, myname, auditor) |
187 hint = (_("consider using '--cwd %s'") |
187 relpath = util.pathto(root, cwd, '') |
188 % os.path.relpath(root, cwd)) |
188 if relpath[-1] == pycompat.ossep: |
|
189 relpath = relpath[:-1] |
|
190 hint = (_("consider using '--cwd %s'") % relpath) |
189 except error.Abort: |
191 except error.Abort: |
190 pass |
192 pass |
191 |
193 |
192 raise error.Abort(_("%s not under root '%s'") % (myname, root), |
194 raise error.Abort(_("%s not under root '%s'") % (myname, root), |
193 hint=hint) |
195 hint=hint) |