##// END OF EJS Templates
largefiles: preserve the exit status of the forget command...
Matt Harbison -
r17579:cbacb5a8 stable
parent child Browse files
Show More
@@ -894,7 +894,7 b' def overridefetch(orig, ui, repo, *pats,'
894
894
895 def overrideforget(orig, ui, repo, *pats, **opts):
895 def overrideforget(orig, ui, repo, *pats, **opts):
896 installnormalfilesmatchfn(repo[None].manifest())
896 installnormalfilesmatchfn(repo[None].manifest())
897 orig(ui, repo, *pats, **opts)
897 result = orig(ui, repo, *pats, **opts)
898 restorematchfn()
898 restorematchfn()
899 m = scmutil.match(repo[None], pats, opts)
899 m = scmutil.match(repo[None], pats, opts)
900
900
@@ -911,6 +911,7 b' def overrideforget(orig, ui, repo, *pats'
911 os.path.isdir(m.rel(lfutil.standin(f))):
911 os.path.isdir(m.rel(lfutil.standin(f))):
912 ui.warn(_('not removing %s: file is already untracked\n')
912 ui.warn(_('not removing %s: file is already untracked\n')
913 % m.rel(f))
913 % m.rel(f))
914 result = 1
914
915
915 for f in forget:
916 for f in forget:
916 if ui.verbose or not m.exact(f):
917 if ui.verbose or not m.exact(f):
@@ -932,6 +933,8 b' def overrideforget(orig, ui, repo, *pats'
932 finally:
933 finally:
933 wlock.release()
934 wlock.release()
934
935
936 return result
937
935 def getoutgoinglfiles(ui, repo, dest=None, **opts):
938 def getoutgoinglfiles(ui, repo, dest=None, **opts):
936 dest = ui.expandpath(dest or 'default-push', dest or 'default')
939 dest = ui.expandpath(dest or 'default-push', dest or 'default')
937 dest, branches = hg.parseurl(dest, opts.get('branch'))
940 dest, branches = hg.parseurl(dest, opts.get('branch'))
@@ -116,6 +116,9 b' Remove both largefiles and normal files.'
116 $ hg remove large1-test
116 $ hg remove large1-test
117 not removing large1-test: file is untracked
117 not removing large1-test: file is untracked
118 [1]
118 [1]
119 $ hg forget large1-test
120 not removing large1-test: file is already untracked
121 [1]
119 $ rm large1-test
122 $ rm large1-test
120
123
121 Copy both largefiles and normal files (testing that status output is correct).
124 Copy both largefiles and normal files (testing that status output is correct).
General Comments 0
You need to be logged in to leave comments. Login now