summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix repo prune to work on git 1.6.1-rc3~5 and laterShawn O. Pearce2009-03-021-11/+8
| | | | | | | | | | | | | | | | | | | | | Prior to git 1.6.1-rc3~5 the output of 'git branch -d' matched: Deleted branch (.*)\. where the subgroup grabbed the branch name. In v1.6.1-rc3~5 (aka a126ed0a01e265d7f3b2972a34e85636e12e6d34) Brandon Casey changed the output to include the SHA-1 of the branch name, now matching the pattern: Deleted branch (.*) \([0-9a-f]*\)\. Instead of parsing the output of git branch we now re-obtain the list of branches after the deletion attempt and perform a set difference in memory to determine which branches we were able to successfully delete. Bug: REPO-9 Signed-off-by: Shawn O. Pearce <sop@google.com>
* Mergev1.6Android Code Review2009-02-101-19/+0
|\
| * Remove the now unnecessary MakefileShawn O. Pearce2009-01-261-19/+0
| | | | | | | | | | | | | | | | | | In a pure Python project run directly from source we really don't have a need for a Makefile. Previously it held the rule to update the protobuf client from Gerrit1, but now that we have retired that logic we don't need it anymore. Signed-off-by: Shawn O. Pearce <sop@google.com>
* | MergeAndroid Code Review2009-02-1025-6287/+1
|\|
| * Remove the protobuf based HTTP upload code pathShawn O. Pearce2009-01-2625-6287/+1
| | | | | | | | | | | | | | | | | | Now that Gerrit2 has been released and the only supported upload protocol is direct git push over SSH we no longer need the large and complex protobuf client library, or the upload chunking logic in gerrit_upload.py. Signed-off-by: Shawn O. Pearce <sop@google.com>
* | Fix color parsing to not crash when user defined colors are setv1.5.1Shawn O. Pearce2009-02-021-1/+1
|/ | | | | | | | | | | We didn't use the right Python string methods to parse colors. $ git config --global color.status.added yellow managed to cause a stack trace due to undefined methods trim() and lowercase(). Instead use strip() and lower(). Signed-off-by: Shawn O. Pearce <sop@google.com>
* Support Gerrit2's ssh:// based uploadv1.5Shawn O. Pearce2009-01-052-24/+91
| | | | | | | | | | | In Gerrit2 uploads are sent over "git push ssh://...", as this is a more efficient transport and is easier to code from external scripts and/or direct command line usage by an end-user. Gerrit1's HTTP POST based format is assumed if the review server does not have the /ssh_info URL available on it. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Remove astray commav1.4.4Marcelo E. Magallon2008-12-311-1/+1
| | | | | | | | | | | | There's an extra "," at the end of the line, which is causing trouble when the manifest file specifies a revision for a project. Since the default manifest file doesn't specify revisions for the projects, the problem has gone unnoticed. Thanks to Barry Silverman <barry@disus.com> for spotting the issue and providing a patch. Signed-off-by: Marcelo E. Magallon <marcelo.magallon@gmail.com>
* Correct the REPO_URL in the wrapper script to android.git.kernel.orgv1.4.3Shawn O. Pearce2008-12-181-2/+2
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Describe upload --replace in upload's help textv1.4.2Shawn O. Pearce2008-12-121-0/+6
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Don't accept multiple commits for the same change in upload --replaceShawn O. Pearce2008-12-121-1/+6
| | | | | | | | Gerrit won't permit more than one commit using the same change number during a replacement request, so we should error out if the user has asked for this in their upload edit script. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Fix upload --replace after it was broken when --review,--cc was addedv1.4.1Shawn O. Pearce2008-11-241-2/+2
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Support <remove-project name="X"> in manifest to remove/replace Xv1.4Shawn O. Pearce2008-11-202-0/+26
| | | | | | | | The manifest files now permit removing a project so the user can either keep it out of their client, or replace it with a different project using an entirely different configuration. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Add --review and --cc flags to repo upload, so you canJoe Onorato2008-11-195-20/+88
| | | | assign reviewers when you upload changes.
* Make repo's editor work when the editor is a commandline withv1.3.2Joe Onorato2008-11-141-2/+2
| | | | multiple args.
* Paper bag fix repo 1.3's "repo upload" without --replacev1.3.1Shawn O. Pearce2008-11-121-4/+5
| | | | | | | If we aren't doing a replacement we do not have any replace rules, so we cannot iterate over them. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Teach 'repo upload --replace' how to add replacement patch setsv1.3Shawn O. Pearce2008-11-123-4/+83
| | | | | | | | | | | | | | Users are prompted with the list of known changes we are about to upload, and they can fill out the current change numbers for any changes which already exist in the data store. For each of those changes the change number and commit id is sent as part of the upload request, so Gerrit can insert the new commit as a new patch set of the existing change, rather than make a new change. This facility permits developers to replace a patch so they can address comments made on a prior version of the same change. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Update proto client to support patch set replacmentsShawn O. Pearce2008-11-122-6/+55
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Refactor part of GetUploadableBranches to lookup one specific branchShawn O. Pearce2008-11-121-6/+14
| | | | | | | This way project.GetUploadableBranch(project.CurrentBranch) can tell us how (if at all) to upload the currently checked out branch. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Treat missing attributes as None when parsing the manifestv1.2Shawn O. Pearce2008-11-061-0/+2
| | | | | | Some of our code assumes that a property is None. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Add <add-remote to-project="..."> to inject additional remotesShawn O. Pearce2008-11-062-8/+43
| | | | | | | | | | | This way users can add forks they know about to an existing project that was already declared in the primary manifest. This is mostly useful with the Linux kernel project, where multiple forks is quite common for the main upstream tree (e.g. Linus' tree), a platform architecture tree (e.g. ARM) and a device specific tree (e.g. the msm7k tree used by Android). Signed-off-by: Shawn O. Pearce <sop@google.com>
* Add <remote project-name="..."> attribute within projectsShawn O. Pearce2008-11-064-6/+26
| | | | | | | | | | | | By setting a project-name on a remote nested within a project forks of a project like the Linux kernel can be easily handled by fetching all relevant forks into the same client side project under different remote names. Developers can create branches off different remotes using `git checkout --track -b $myname $remote/$branch` and later `repo upload` automatically redirects to the proper fork project in the code review server. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Use remote.*.projectname to indicate the target project for uploadShawn O. Pearce2008-11-062-1/+11
| | | | | | | | This way "forks" of a project, e.g. the linux kernel, can be setup to use different destination projects in the review server by creating different remotes in the client side Git repository. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Add some short documentation about the local manifestShawn O. Pearce2008-11-061-0/+29
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Add 'repo init --mirror' to download a complete forrestv1.1Shawn O. Pearce2008-11-056-20/+109
| | | | | | | | | | | | | | | The mirror option downloads a complete forrest (as described by the manifest) and creates a replica of the remote repositories rather than a client working directory. This permits other clients to sync off the mirror site. A mirror can be positioned in a "DMZ", where the mirror executes "repo sync" to obtain changes from the external upstream and clients inside the protected zone operate off the mirror only, and therefore do not require direct git:// access to the external upstream repositories. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Add a basic outline of the repo manifest file formatShawn O. Pearce2008-11-041-0/+126
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Update proto_client to notify the user when auth cookies are accessedShawn O. Pearce2008-11-042-20/+40
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Assume the manifest branch matches the branch name in GitShawn O. Pearce2008-11-041-6/+7
| | | | | | | | | | | Whatever branch name we checked the manifest out from is the name we want to reflect throughout the rest of the projects, e.g. within the special "m/" remote space. This reduces the difference between different branches within the manifest file. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Cleanup stale manifest migration code from manifest.pyShawn O. Pearce2008-11-041-9/+2
| | | | | | | | | | | Prior to open-sourcing repo we had manifests in two different layouts; one where the manifest was a straight-up git clone, and one where the manifest was our bare repository with symlink work tree format (identical to what our projects use). Only the latter form is created or used by repo at this point, so the transition code to handle the straight-up git clone is not necessary. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Introduce 'repo abandon <branchname>' as an alias for 'git branch -D'v1.0.9Shawn O. Pearce2008-11-032-0/+58
| | | | | | | | This destroys a local development branch, removing all history of that branch from ever existing. If the branch is currently checked out we move back to the upstream revision. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Install a default pre-auto-gc hook in all repositoriesShawn O. Pearce2008-11-035-22/+110
| | | | | | | | | | | | | | | | | | | | This hook is evaluated by `git gc --auto` to determine if it is a good idea to execute a GC at this time, or defer it to some later date. When working on a laptop its a good idea to avoid GC if you are on battery power as the extra CPU and disk IO would consume a decent amount of the charge. The hook is the standard sample hook from git.git contrib/hooks, last modified in git.git by 84ed4c5d117d72f02cc918e413b9861a9d2846d7. I added the GPLv2 header to the script to ensure the license notice is clear, as it does not match repo's own APLv2 license. We only update hooks during initial repository creation or on a repo sync. This way we don't incur huge overheads from the hook stat operations during "repo status" or even the normal "repo sync" cases. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Catch symlink creation failures and report a better errorShawn O. Pearce2008-11-031-2/+9
| | | | | | | | | | Some users have noticed that repo doesn't work on VFAT, as we require a POSIX filesystem with POSIX symlink support. Catching the OSError during our symlink creation and raising a GitError with a more descriptive message will help users to troubleshoot and fix their own installation problems. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Don't print "Already up-to-date" during repo syncv1.0.8Shawn O. Pearce2008-10-301-1/+5
| | | | | | | | If we are already up-to-date we just want to display no output. This means we have to avoid calling "git merge" if there aren't commits to be merged into the working directory. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Fast-forward a fully merged topic branch during 'repo sync'Shawn O. Pearce2008-10-301-0/+9
| | | | | | | | | | Instead of trying to rebase the changes on a topic branch that has been fully merged into the upstream branch we track, we should just fast-forward the topic branch to the new upstream revision. This way the branch doesn't try to rewrite commits that are already merged in the upstream. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Remove import_tar, import_zip and the <snapshot> elementsv1.0.7Shawn O. Pearce2008-10-305-1214/+0
| | | | | | | | | | Now that repo relies only on the git data stream (as it is much faster to download through) we don't really need to be parsing the <snapshot> elements within manifest. Its a lot of complex code to convert the tar (or zip) through to a fast import stream, and we just aren't calling it anymore. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Cache the per-user configuration to avoid duplicate instancesShawn O. Pearce2008-10-291-1/+5
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Move the Editor configuration out of Manifest's constructorShawn O. Pearce2008-10-292-3/+2
| | | | | | | | This way we can build more than one Manifest instance in memory and not muck around with the Editor configuration each time we build a new instance. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Don't flip out if there are no template hooksShawn O. Pearce2008-10-291-1/+5
| | | | | | | | Git may have been installed without its hooks directory, which means we won't have any hooks in a repo created git repository. Since we are just deleting the hooks it doesn't matter. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Stop downloading snapshots as native git:// is fasterShawn O. Pearce2008-10-281-29/+0
| | | | | | | | | Downloading and streaming a tar into Git is slower than just letting the native git:// protocol handle the data transfer, especially when there are multiple revisions available and Git can perform delta compression across revisions. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Stop hiding remote missing object errorsShawn O. Pearce2008-10-281-34/+2
| | | | | | | | | Hiding error messages from the remote peer is not a good idea, as users should be made aware when the remote peer is not a complete Git repository so they can alert the administrators and have the repository corrected. Signed-off-by: Shawn O. Pearce <sop@google.com>
* wrapper 1.6Shawn O. Pearce2008-10-281-1/+1
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Added missing wait after git-version call in wrapperShawn O. Pearce2008-10-281-0/+1
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Remove unused import from gerrit_upload.pyShawn O. Pearce2008-10-281-1/+0
| | | | Signed-off-by: Shawn O. Pearce <sop@google.com>
* Repair any mis-directed android-1.0 annotated tagsv1.0.6Shawn O. Pearce2008-10-241-0/+25
| | | | | | | | | | | | | | | | | | The initial open source release of the Android 1.0 platform had some problems with its Perforce->Git imports. Google was forced to rewrite some history to redirect users onto more stable upstream sources and correct errors in the imports. Not everyone has the correct android-1.0 tags, as some users did manage to fetch the platform early, before the mirror sites crashed and the history was rewritten. This change is a band-aid to ensure any stale android-1.0 tags are get updated to the corrected version. It should be backed out at some point in the near future, when we can be fairly certain that everyone has the correct android-1.0 tags. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Support user supplied custom .repo/local_manifest.xml filesv1.0.5Shawn O. Pearce2008-10-231-5/+17
| | | | | | | | | | | | | | | | | | | By creating a .repo/local_manifest.xml the user can add extra projects into their client space, without touching the main manifest script. For example: $ cat .repo/local_manifest.xml <?xml version="1.0" encoding="UTF-8"?> <manifest> <project path="android-build" name="platform/build" remote="korg" revision="android-1.0" /> </manifest> Signed-off-by: Shawn O. Pearce <sop@google.com>
* Teach repo how to download changes to the local checkoutv1.0.4Shawn O. Pearce2008-10-232-0/+120
| | | | | | | | | | | | | | | | Now `repo download . 1402` would download the change numbered 1402 into the current project and check it out for the user, using a detached HEAD. `repo sync .` would back out of the change and return to the upstream version. Multiple projects can be fetched at once by listing them out on the command line as different arguments. Individual patch sets can be selected by adding a '/n' to indicate the n-th patch set should be downloaded instead of the default of patch set 1. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Show which user account each change was uploaded underv1.0.3Shawn O. Pearce2008-10-222-0/+5
| | | | | | | | This way users are well aware of which account we used when the uploads are complete, so they can be certain to sign into the web application with that user identity. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Change RPC client to only use Google Accounts for authenticationShawn O. Pearce2008-10-222-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Hosted domain account (such as "@google.com" itself) don't work on the Google App Engine service unless the user specifically creates their own Google Account (https://www.google.com/accounts/NewAccount) with the same email address. When both such accounts exist we must *only* use the Google Account in our auth request, as that is all Google App Engine will honor when we send it the session cookie. However, Google has internal servers that may also be running Gerrit based applications. In those case we must use the hosted auth login for @google.com user accounts, as the internal servers honor only the hosted account and not the public Google Account database. In the future we may need to add other domains to the "HOSTED" list if other Gerrit instances are setup on hosted domains and locked to only those domain's user accounts, similar to how a server that is internal to Google would be setup. Since this is currently not a likely occurrence I'm not worrying about making it configurable at this juncture. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Fix StopIteration exception during repo {sync,status}v1.0.2Shawn O. Pearce2008-10-211-2/+5
| | | | | | If we run out of entries next() will throw StopIteration. Signed-off-by: Shawn O. Pearce <sop@google.com>
* Remove the Python 2.4 dependency and use just 'python'v1.0.1Shawn O. Pearce2008-10-212-3/+3
| | | | | | | | | Many Linux distributions are including python2.5 by default, as it is the latest stable release of the language. Using python2.4 (and asking users to specifically install it) is just cruel and unusual punishment. Signed-off-by: Shawn O. Pearce <sop@google.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-28 18:20:06 +0000