summaryrefslogtreecommitdiff
path: root/gbp/scripts/pull.py
AgeCommit message (Collapse)AuthorFilesLines
2022-10-28port code from python2.x to python3.xbiao716.wang1-2/+2
Change-Id: I798c72d07e44839cc5d1e25ec75fca0bd8068567 Signed-off-by: biao716.wang <biao716.wang@samsung.com>
2014-11-14Import RpmGitRepository if DebianGitRepository is not availableZhang Qiang1-2/+5
This is just a workaround, this should be fixed in nicer way by refactoring the code. Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
2014-11-14Add 'packaging-branch' cmdline optionMarkus Lehtonen1-0/+1
This is the counterpart of 'debian-branch' (basically identical to that) to not confuse rpm maintainers. Also, adds this option to gbp-clone and gbp-pull commands (as an alternative to the 'debian-branch option), which are usable for RPM in their current form. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14Rename internal var debian_branch -> packaging_branchMarkus Lehtonen1-3/+3
This is done in sake of more general purpose naming, intended for enabling rpm support. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14gbp-pull: two modes for --forceMarkus Lehtonen1-18/+37
The 'force' option now has two possible values: 'merge': upstream branch is merged, even if fast-forward is not possible. 'clean': check out a clean copy from the upstream if fast-forward is not possible (i.e. no merge). Local changes are lost in this case. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14gbp-pull: similar update strategy for all branchesMarkus Lehtonen1-3/+10
Treat non-checked-out branches similarly to the current branch when forcing update. That is, do git merge, instead of just setting the ref. Also, renames fast_forward_branch() to update_branch() to better match the functionality. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14gbp-pull: implement --all cmdline optionMarkus Lehtonen1-4/+21
This updates all remote-tracking branches (for the remote that is fetched from) whose local branch name is identical to the remote branch name. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-08-23Unify doc strings a bitGuido Günther1-1/+1
since they now show up with --list-cmds
2014-04-03config: add decorator to add_option_* functionsGuido Günther1-3/+11
This allows us to build an internal list of valid options and print these.
2014-03-29Use a much simpler version to fix the command name in --helpGuido Günther1-1/+2
mostly reverting e1780f0. Closes: #742907
2014-03-27Fix command outputGuido Günther1-2/+1
The first line lacked the subcommand like: $ gbp pull --help Usage: gbp [options] - safely update a repository from remote instead of $ gbp pull --help Usage: gbp pull [options] - safely update a repository from remote ^^^^
2014-01-05Avoid backtrace on config file parse errorsGuido Günther1-7/+18
"gbp buildpackage" did this already but others didn't Closes: #733759
2013-05-04gbp-pull: Fix typo in help outputGuido Günther1-1/+1
2013-05-02Add --ignore-branch to gbp-pullGuido Günther1-1/+11
This allows us to fetch upstream and pristine-tar even when in detached head state. This can be usefull when e.g. building in jenkins which uses a detached head by default.
2013-03-22gbp-pull: update tags, tooMarkus Lehtonen1-0/+1
To make sure that the tags are in sync with the remote. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2013-01-17gbp-pull: fix --depth cmdline optionMarkus Lehtonen1-1/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2012-11-25New configuration option for setting the output color schemeMarkus Lehtonen1-1/+3
Adds a new command line and config file option 'color-scheme' for selecting the colors used in log output. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2012-07-28GitRepository: raise GitRepositoryError on git errorsGuido Günther1-1/+1
Raise GitRepositoryError in cases where CommandExecFailed (from GitCommand) was previously silently passed forward. Heavily based on a patch by Markus Lehtonen <markus.lehtonen@linux.intel.com>
2012-07-02Make exception syntax consistentGuido Günther1-1/+1
2012-02-13Rename GbpOptionParserCommon common to GbpOptionParserGuido Günther1-3/+3
2012-02-13Refactor config.py as preparation for rpm support.Markus Lehtonen1-3/+3
Split GbpOptionParser in to a common base class and a Debian specific subclass, as a preparation for upcoming RPM support. This allows having different default values (and help texts) for common options between different package types, and, clearer separation of package type specific options. Signed-off-by: Guido Günther <agx@sigxcpu.org>
2012-02-10gbp-pull: Use a DebianGitRepositoryGuido Günther1-2/+3
Closes: #59290
2012-01-22PristineTar: move to separate moduleGuido Günther1-4/+3
and make it accessible from GitRepository to group checkout/checkin/lookup.
2012-01-17Add git-depth option to gbp-clone and gbp-pullMarkus Lehtonen1-1/+3
Allows creating and deepening shallow clones. This is sometimes useful for e.g. saving bandwidth when cloning.
2011-11-06gbp-pull: massive speedup by just updating the refGuido Günther1-2/+6
to the remote's SHA1 instead of checking out the branch and doing a fast-forward merge.
2011-11-01Get rid of the symlinkGuido Günther1-0/+134
by moving the commands to gbp/scripts/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 14:13:24 +0000