launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/rocketfuel-get-git into lp:launchpad.

Commit message:
Add Git support to rocketfuel-get.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/rocketfuel-get-git/+merge/373198

I'm not especially convinced that we want to keep the rocketfuel-* infrastructure in the long term, but for now it's used by the odd bit of deployment machinery so it's easier to keep it up to date.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/rocketfuel-get-git into lp:launchpad.

=== modified file 'utilities/rocketfuel-get'
--- utilities/rocketfuel-get	2017-12-19 09:46:14 +0000
+++ utilities/rocketfuel-get	2019-09-25 12:55:24 +0000
@@ -33,9 +33,16 @@
 LP_DOWNLOAD_CACHE_PATH="$(eval echo ${LP_DOWNLOAD_CACHE_PATH})"
 
 # Pull launchpad devel from launchpad.
-INITIAL_REV=$(bzr revno "$LP_TRUNK_PATH")
-bzr pull -d "$LP_TRUNK_PATH"
-FINAL_REV=$(bzr revno "$LP_TRUNK_PATH")
+if [ -d "$LP_TRUNK_PATH/.git" ]
+then
+    INITIAL_REV=$(git -C "$LP_TRUNK_PATH" rev-parse HEAD)
+    git -C "$LP_TRUNK_PATH" pull
+    FINAL_REV=$(git -C "$LP_TRUNK_PATH" rev-parse HEAD)
+else
+    INITIAL_REV=$(bzr revno "$LP_TRUNK_PATH")
+    bzr pull -d "$LP_TRUNK_PATH"
+    FINAL_REV=$(bzr revno "$LP_TRUNK_PATH")
+fi
 
 # Make sure our directories are around.
 mkdir -p "$LP_SOURCEDEPS_PATH" "$YUI_PATH"