summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* error: fix typosAnthony King2015-06-041-2/+2
| | | | Change-Id: I09c47024ef54c360ea3c15c5d4f169e13444e412
* git_command: only decode when neededAnthony King2015-06-031-1/+4
| | | | | | strings no longer need decoding, since unicode is str Change-Id: I9516d298fee7ddc058452394b7759327fe3aa7a8
* decode the buffer before appendingAnthony King2015-06-031-0/+2
| | | | | | | | | | output from a process is in bytes in python3. we need to decode it. in Python3, bytes don't have an encode attribute. use this to identify it. Change-Id: I152f2ec34614131027db680ead98b53f9b321ed5
* Merge changes I32da12c2,Ie4a65b3eDavid Pursehouse2015-06-022-4/+22
|\ | | | | | | | | | | * changes: Skip sleep and retry if git remote update exits with a signal Catch exceptions in project list generator
| * Skip sleep and retry if git remote update exits with a signalColin Cross2015-05-131-0/+3
| | | | | | | | | | | | | | | | | | Pressing ctrl-c during repo sync often hangs for 30 to 45 seconds due to the time.sleep and retry in _RemoteFetch. If git exits with a signal, for example -2 for SIGINT triggered by ctrl-c, skip the sleep and retry. Change-Id: I32da12c2dcc96d9cc0b12a066e824b12ebfb52a0
| * Catch exceptions in project list generatorColin Cross2015-05-131-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the generator that produces per-project worker arguments raises an exception it triggers python bug http://bugs.python.org/issue8296. Rewrite the generator expression as a generator function, and catch Exceptions and KeyboardInterrupts to end the iteration. Also add a pool worker initializer to disable SIGINT to prevent KeyboardInterrupts inside multiprocessing.Pool in the worker threads causing the same problem. Fixes easy-to-reproduce hangs when hitting ctrl-c during repo forall -c echo Change-Id: Ie4a65b3e1e07a64ed6bb6ff20f3912c4326718ca
* | Make linkfile symlinks relativeColin Cross2015-06-011-6/+7
|/ | | | | | | | | | | The source (target) of the symlink is specified relative to a project within a tree, and the destination is specified relative to the top of the tree, so it should always be possible to create a relative symlink to the target file. Relative symlinks will allow moving an entire tree without breaking the symlink, and copying a tree (with -p) without leaving a symlink to the old tree. Change-Id: I16492a8b59a137d2abe43ca78e3b212e2c835599
* Merge "Don't attempt to create "fully qualified names" for SHA1s"David Pursehouse2015-05-111-1/+1
|\
| * Don't attempt to create "fully qualified names" for SHA1sAlexandre Boeglin2015-04-301-1/+1
| | | | | | | | | | | | Doing so breaks "repo init -b <SHA1>". Change-Id: Ic071a1b099a9125db22ea446d7e92e7854d69b37
* | Merge "Add option on sync to avoid fetching from remotes for existing sha1"David Pursehouse2015-05-012-6/+21
|\ \
| * | Add option on sync to avoid fetching from remotes for existing sha1David Pursehouse2015-04-302-6/+21
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | In 2fb6466f795eb30c1dfa598501f5b5d2981e6a5f an optimisation was added to avoid fetching from remotes if the project is fixed to a revision and the revision is already available locally. This causes problems for users who expect all objects to be fetched by default. Change the logic so that the optimized behaviour is only enabled if an option is explicitly given to repo sync. Change-Id: I3b2794ddd8e0071b1787e166463cd8347ca9e24f
* / Add --prune option to fetch when syncing a mirror repoDavid Pursehouse2015-04-301-0/+2
|/ | | | | | | When syncing a mirror repo, add the --prune option to the fetch command to force removal of stale refs from the mirror. Change-Id: I4b43b2a5c86b9915627887c16f6569066f3ab978
* Fix substitution err for schemeless manifest urlsv1.12.22Conley Owens2015-04-291-1/+2
| | | | | | | | Previously, we used a regex that would only remove a phony string from a url if it existed, but we recently replaced that with a slice. This change goes back to the previous behavior. Change-Id: I8baf527be01c4b49d45b903b31a1cd6315563d5b
* Don't append branch to fetch spec when syncing to a mirrorv1.12.21David Pursehouse2015-04-271-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | Appending the branch to the fetch spec causes sync of a mirror to fail for projects that don't have an explicit revision specified, and don't have a branch of the same name as the default revision. For example, a manifest defining a default revision: <default revision="master"> having a project without an explicit revision: <project name="path/to/project"> and not having a branch named "master", will cause repo sync to fail for that project with the error: Couldn't find remote ref refs/heads/master Modify the logic to not append the branch onto the fetch spec when syncing to a mirror. Change-Id: I5c4457bd125519abf27abe682dea62ad708978c9
* Merge "forall: use a generator to map the Pool"Conley Owens2015-04-081-2/+2
|\
| * forall: use a generator to map the PoolAnthony King2015-04-081-2/+2
| | | | | | | | | | | | | | | | Before, a list was generated, which is why there was a massive delay. Using a generator will allow processes to start straight away Change-Id: Ia325b0b340cc328c08c9bcc92a6709bbdaf6a664
* | Merge "status: lose dependence on StringIO"Conley Owens2015-04-081-33/+15
|\ \ | |/ |/|
| * status: lose dependence on StringIOAnthony King2015-04-041-33/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | buflist was being used, which isn't available in Python 3. `Execute` was using StringIO to capture the output of `PrintWorkTreeStatus`, only to redirect it straight to stdout. Instead, just let `PrintWorkTreeStatus` do it's own thing directly to stdout. for handling `_FindOrphans`, we swap StringIO for a list. Nothing was done that needed a a file like object. Change-Id: Ibdaae137904de66a5ffb590d84203ef0fe782d8b
* | Remove deprecated `include-ids` setting from pylint configDavid Pursehouse2015-04-071-3/+0
| | | | | | | | Change-Id: Ie5ab21e434d24ff862bb5e0c263761370d71f56f
* | Merge "Pylint and PEP8 fixes for color.py"David Pursehouse2015-04-071-21/+27
|\ \ | |/ |/|
| * Pylint and PEP8 fixes for color.pyAnthony King2015-03-281-21/+27
| | | | | | | | Change-Id: I1a676e25957a7b5dd800d2585a2ec7fe75295668
* | Maintain fully qualified tracking branchesConley Owens2015-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | When running repo branch, the git merge line (in many circumstances) is set to the revision of the project specified in the manifest. If this is a branch name that is not fully-qualified, we will end up with something like "merge = master" instead of "merge = refs/heads/master". This change examines the revision if we are going to use that and changes branch short names to fully qualified branch names. Change-Id: Ie1be94fb8d45df8eeac44a47f729a3819a05fa81
* | Resolve fetch urls more efficientlyAnthony King2015-03-311-16/+9
| | | | | | | | | | | | | | | | | | | | | | Instead of using regex, append the netloc and relative scheme lists with the custom scheme. The schemes will only be appended when needed, instead of passing X amount of regex replaces. see http://bugs.python.org/issue18828 for more details. Change-Id: I10d26d5ddc32e7ed04c5a412bdd6e13ec59eb70f
* | use the max depth instead of unshallowAnthony King2015-03-301-1/+2
| | | | | | | | | | | | This allows the use of older versions of git Change-Id: I88ea685066603af19896a791829355ddbfa91ffe
* | Revert "Change the min git version from 1.7.2 to 1.8.2"Anthony King2015-03-301-2/+2
|/ | | | | | This reverts commit 52b99aa91d0fbb5ea363b5febb367d602dbc56db. Change-Id: I01d93704c92f7af1ca2b36dbc9509ee1290e2d3c
* Always capture output for GitCommandJohn L. Villalovos2015-03-262-17/+54
| | | | | | | | | | | | | | Switch the GitCommand program to always capture the output for stdout and stderr. And by default print the output while running. The options capture_stdout and capture_stderr have effectively become options to supress the printing of stdout and stderr. Update the 'git fetch' to use '--progress' so that the progress messages will be displayed. git checks if the output location isatty() and if it is not a TTY it will by default not print the progress messages. Change-Id: Ifdae138e008f80a59195f9f43c911a1a5210ec60
* Change the min git version from 1.7.2 to 1.8.2Conley Owens2015-03-181-2/+2
| | | | | | This is needed for the --unshallow option of git fetch. Change-Id: Ifdc5cec6130315c643924328fea425f1b94cb04a
* Revert "Implementation of manifest defined githooks"v1.12.20Jonathan Nieder2015-03-174-117/+28
| | | | | | | | | | | | | | | This reverts commit 38e4387f8eb8cffd6359d726c38a7c524fef07e3. A "repo init" followed by "repo sync" is meant to be as safe as "git clone". In particular it should not run arbitrary code provided by the manifest owner. It would still be nice to have support for manifest-defined git hooks --- they'd just need a prompt like the upload RepoHook has. Hopefully a later change can bring them back. Change-Id: I5ecd90fb5c2ed64f103d856d1ffcba38a47b062d Signed-off-by: Jonathan Nieder <jrn@google.com>
* Merge "Don't exit with error on HTTP 401 when downloading clone bundle"Conley Owens2015-03-111-1/+1
|\
| * Don't exit with error on HTTP 401 when downloading clone bundlePascal Bach2015-03-111-1/+1
| | | | | | | | | | | | | | | | If the server returns HTTP 401 (unauthorized) when attempting to download clone bundle files, ignore it and continue, rather than exiting with a fatal error. Change-Id: I2c7ee03e149c354c7e4ad6ea1ebf266534778fe1
* | Add space between project path and branch in repo status.Jakub Vrana2015-03-111-1/+1
|/ | | | | | | | Currently, paths longer than 39 chars have no space after them so it looks like this: project path/branch master Change-Id: I4c1bb13648ac099ade8a8d4ebafa04131571f842
* git_config: add support for remote '.'v1.12.19Yann Droneaud2015-03-061-1/+1
| | | | | | | | | | | | | | | | | | | As a fix for issue #149, this patch add support for the remote '.' (local). As an alias for the local repository, remote '.' is lacking a fetch = config in .git/config. Without such refspec, repo info --overview is not able to process a local tracking branch. v2: Check for name == '.' before checking if merge starts with refs/, since the case where it's not is invalid. Signed-off-by: Yann Droneaud <ydroneaud@opteya.com> Signed-off-by: Filipe Brandenburger <filbranden@google.com> Change-Id: I8c8fd8602cd68baecb530301ae41d37d751ec85d
* Merge "Implementation of manifest defined githooks"Conley Owens2015-03-054-28/+117
|\
| * Implementation of manifest defined githooksJimmie Wester2015-02-034-28/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When working within a team or corporation it is often useful/required to use predefined git templates. This change teaches repo to use a per-remote git hook template structure. The implementation is done as a continuation of the existing projecthook functionality. The terminology is therefore defined as projecthooks. The downloaded projecthooks are stored in the .repo directory as a metaproject separating them from the users project forest. The projecthooks are downloaded and set up when doing a repo init and updated for each new repo init. When downloading a mirror the projecthooks gits are not added to the bare forest since the intention is to ensure that the latest are used (allows for company policy enforcement). The projecthooks are defined in the manifest file in the remote element as a subnode, the name refers to the project name on the server referred to in the remote. <remote name="myremote ..> <projecthook name="myprojecthookgit" revision="myrevision"/> </remote> The hooks found in the projecthook revision supersede the stock hooks found in repo. This removes the need for updating the projecthook gits for repo stock hook changes. Change-Id: I6796b7b0342c1f83c35f4b3e46782581b069a561 Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com> Signed-off-by: Ian Kumlien <ian.kumlien@gmail.com>
* | Print stderr output from git command for RemoteFetchJohn L. Villalovos2015-02-251-2/+4
| | | | | | | | | | | | | | The stderr output generated by git during a RemoteFetch was not being printed. This information is useful so print it. Change-Id: I6e6ce12c4a57e5ca2359f76ce14f2fcbbc37a5ef
* | Ensure the repo project is never fetched with partial depthv1.12.18Conley Owens2015-02-101-0/+3
| | | | | | | | | | | | | | | | If the repo project is synced with partial depth, then the tags won't be fetched and users will be told the newest sha1 in the stable branch isn't signed. Change-Id: I107df97b4836b928c76aa33a700fa35d1705ae09
* | Handle case where 'git remote prune' needs to be runJohn L. Villalovos2015-02-031-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the case when this error occurs: error: some local refs could not be updated; try running 'git remote prune origin' to remove any old, conflicting branches This is usually caused by a reference getting changed from a file to a directory. For example: Initially someone creates a branch 'foo' and it is stored as: .git/refs/remotes/origin/foo Then later on it is decided to change the layout structure where 'foo' is a directory with branches below it: .git/refs/remotes/origin/foo/master The problem occurs when someone still has '.git/refs/remotes/origin/foo' on their system and does a repo sync. When this occurs the error message for needing to do a 'git remote prune origin' occurs. Now when doing a 'git fetch' if the error message from git says that a 'git remote prune' is needed, it will do the prune and then retry the fetch. Change-Id: I4c6f5aa6bd932f0ef7a39134400bedd52e82f633 Signed-off-by: John L. Villalovos <john.l.villalovos@intel.com>
* | Merge "Add missing documentation of --current-branch option on sync command"David Pursehouse2015-01-311-0/+3
|\ \
| * | Add missing documentation of --current-branch option on sync commandDavid Pursehouse2015-01-291-0/+3
| |/ | | | | | | Change-Id: I72d6e3d51241148c1df97bbad26338debb1fcb4e
* | Merge "Use depth flag when fetching"Conley Owens2015-01-301-3/+1
|\ \ | |/ |/|
| * Use depth flag when fetchingConley Owens2015-01-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we only use the depth flag when cloning. The result is that when new project history has merges, the entire history of the merged branch is brought in and the project becomes unshallow very quickly. --depth and clone-depth are often used to save on space, not just network load, so this seems less than ideal. This change uses --depth on every fetch (when the user has depth specified), not just the initial clone. The result is that the given project stays consistently shallow as opposed to growing over time, especially when merges are involved. Change-Id: Iac706cfdad4a555c72f9d9f1119195d38d91df12
* | Merge "Handle shallow checkout of SHA1 pinned repos"Conley Owens2015-01-281-8/+20
|\ \
| * | Handle shallow checkout of SHA1 pinned reposBertrand SIMONNET2015-01-211-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a shallow checkout SHA1 pinned repos with repo init --depth=1 and repo sync -c, repo would try to fetch only some reference and fail if the exact SHA1 repo was missing. Instead, when depth is set, fetch only the specific commit. Change-Id: If3f799d0e78c03faea47f796380bb5e367b11998
* | | Merge "Don't delete hooks in .git/hooks"Conley Owens2015-01-281-9/+0
|\ \ \
| * | | Don't delete hooks in .git/hooksMitchel Humpherys2015-01-151-9/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently delete all hooks in .git/hooks for each project before symlink'ing in the standard project hooks. This can be annoying for users who have installed custom git hooks. There's no reason to delete all existing hooks. Just rip out the deletion code. Change-Id: I5062a6cd20af700f6d6a17b11ad6c94853987c57 Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
* | / pylint fixes for project.pyAnthony King2015-01-222-105/+105
| |/ |/| | | | | | | | | Fix all the formatting warnings and unused variables Change-Id: I17d88a23572303879530077f3a80451de5417fbb
* | Respect --quiet when looking up bundle cookie filev1.12.17Dave Borowitz2015-01-021-3/+3
| | | | | | | | Change-Id: I02a244132c49e4bb50ecda978974d6d2b220f6d1
* | Save cookies back to jar when fetching clone.bundleDave Borowitz2015-01-021-1/+1
| | | | | | | | Change-Id: I3ef71b5e7f8ee1cda66057e46ae234866c7258c4
* | Hold persistent proxy connection open while fetching clone.bundleDave Borowitz2015-01-021-41/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The persistent proxy may choose to present a per-process cookie file that gets cleaned up after the process exits, to help with the fact that libcurl cannot save cookies atomically when a cookie file is shared across processes. We were letting this cleanup happen immediately by closing stdin as soon as we read the configuration option, resulting in a nonexistent cookie file by the time we use the config option. Work around this by converting the cookie logic to a context manager method, which closes the process only when we're done with the cookie file. Change-Id: I12a88b25cc19621ef8161337144c1b264264211a
* | Merge "add a global --color option"Conley Owens2015-01-022-2/+31
|\ \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-15 10:55:57 +0000