git p4: rearrange and simplify hasOrigin handling
Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pete Wyckoff committed
Jan 14, 2013 at 19:46 UTC
991a2de45af713ad6476c3d03aefb30ba5599bfe
1 file changed
+7
-7
git-p4.py
+7
-7
@@ -2748,23 +2748,23 @@ class P4Sync(Command, P4UserMap):
2748
self.changeRange = ""
2749
self.initialParent = ""
2750
self.previousDepotPaths = []
2751
+ self.hasOrigin = False
2752
2753
# map from branch depot path to parent branch
2754
self.knownBranches = {}
2755
self.initialParents = {}
2755
- self.hasOrigin = originP4BranchesExist()
2756
- if not self.syncWithOrigin:
2757
- self.hasOrigin = False
2756
2757
if self.importIntoRemotes:
2758
self.refPrefix = "refs/remotes/p4/"
2759
else:
2760
self.refPrefix = "refs/heads/p4/"
2761
2764
- if self.syncWithOrigin and self.hasOrigin:
2765
- if not self.silent:
2766
- print "Syncing with origin first by calling git fetch origin"
2767
- system("git fetch origin")
2762
+ if self.syncWithOrigin:
2763
+ self.hasOrigin = originP4BranchesExist()
2764
+ if self.hasOrigin:
2765
+ if not self.silent:
2766
+ print 'Syncing with origin first, using "git fetch origin"'
2767
+ system("git fetch origin")
2768
2769
if len(self.branch) == 0:
2770
self.branch = self.refPrefix + "master"