From 6d75435eabbe56ed514b57f911eccd9de4f0bae9 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Sat, 3 May 2025 11:35:51 +0200 Subject: [PATCH] helper: align update of reference to shared hg repo ... to use a relative path where possible --- git-hg-helper | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git-hg-helper b/git-hg-helper index e3804fd..b7f6653 100755 --- a/git-hg-helper +++ b/git-hg-helper @@ -227,9 +227,12 @@ class GitHgRepo: warn(b'failed to find local hg for remote %s' % (r)) continue else: + npath = os.path.abspath(hg_path) + # use relative path if possible + if check_version(4, 2): + npath = os.path.join(b'..', b'..', b'..', b'.hg') # make sure the shared path is always up-to-date - util.writefile(os.path.join(local_hg, b'sharedpath'), - os.path.abspath(hg_path)) + util.writefile(os.path.join(local_hg, b'sharedpath'), npath) self.hg_repos[r] = os.path.join(local_path) log('%s determined hg_repos %s', self.identity(), self.hg_repos)