aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix some flake8 issuesAdam Spiers2021-04-031-9/+9
|
* Merge pull request #94 from aspiers/ctrl-cAdam Spiers2021-04-031-1/+1
|\ | | | | Don't totally ignore KeyboardInterrupt
| * Don't totally ignore KeyboardInterruptAdam Spiers2021-04-031-1/+1
|/ | | | | | | | Commit 2a05400e2 ignored KeyboardInterrupt. I'm *guessing* I did that to avoid an ugly stacktrace, but even if so, the user's desire to interrupt execution should not be ignored in this way. Fixes #83 and #89.
* Improve HTML installation instructions slightlyAdam Spiers2021-04-031-9/+12
|
* Update INSTALL.md for Python 3.x (#98)Adam Spiers2021-04-031-6/+43
| | | | Fixes #98.
* Update tox.ini for newer PythonsAdam Spiers2021-04-031-1/+1
|
* Merge pull request #106 from aspiers/fix-travisAdam Spiers2021-04-031-15/+6
|\ | | | | Fix Travis builds (#73)
| * Fix Travis builds (#73)Adam Spiers2021-04-031-15/+6
|/ | | | Fixes #73.
* Merge pull request #100 from ↵Adam Spiers2021-04-031-1/+1
|\ | | | | | | | | aspiers/dependabot/npm_and_yarn/git_deps/html/jquery-3.5.0 Bump jquery from 3.0.0 to 3.5.0 in /git_deps/html
| * Bump jquery from 3.0.0 to 3.5.0 in /git_deps/htmldependabot[bot]2020-04-291-1/+1
| | | | | | | | | | | | | | Bumps [jquery](https://github.com/jquery/jquery) from 3.0.0 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.0.0...3.5.0) Signed-off-by: dependabot[bot] <support@github.com>
* | Use line-buffering on output (#87)Adam Spiers2021-04-031-1/+1
|/ | | | | | | | | | Use explicit line buffering of STDOUT. Originally buffering was disabled by #81 to allow better interaction with tee(1), but this breaks Python 3 as per #87. So use line buffering instead. Closes #87 and #93.
* add direct links to presentation videosAdam Spiers2019-06-051-2/+2
|
* add links to blog and Nashville presentationAdam Spiers2019-06-051-3/+6
|
* Merge pull request #86 from GarySmith/fix-linkAdam Spiers2019-01-311-1/+1
|\ | | | | Fix link in readme to USE-CASES.md
| * Fix link in readme to USE-CASES.mdGary Smith2019-01-301-1/+1
|/
* Merge pull request #81 from bmwiedemann/unbufferedAdam Spiers2019-01-211-0/+2
|\ | | | | Use unbuffered IO
| * Use unbuffered IOBernhard M. Wiedemann2019-01-101-0/+2
| | | | | | | | | | | | | | Without this patch, git-deps | tee $FILE only produces output in 4KB chunks so when you have to kill the process after a day, you are left with incomplete output.
* | Merge pull request #84 from mstefani/masterAdam Spiers2019-01-211-1/+5
|\ \ | |/ |/| Don't crash with commit messages that aren't valid utf-8
| * Don't crash with commit messages that aren't valid utf-8Michael Stefaniuc2019-01-201-1/+5
|/
* Merge pull request #80 from aspiers/READMEAdam Spiers2019-01-074-211/+361
|\ | | | | improve docs
| * add Credits sectionAdam Spiers2019-01-061-0/+9
| |
| * split off use cases to separate fileAdam Spiers2019-01-062-161/+163
| |
| * add missing sections to TOCAdam Spiers2019-01-061-0/+2
| |
| * make CONTRIBUTING.md link consistent with othersAdam Spiers2019-01-061-1/+1
| |
| * split off history into HISTORY.mdAdam Spiers2019-01-062-33/+37
| |
| * split off usage into USAGE.mdAdam Spiers2019-01-062-51/+57
| |
| * add use cases sub-TOCAdam Spiers2019-01-061-0/+11
| |
| * add 2018 presentationsAdam Spiers2019-01-061-2/+9
| |
| * add blank lines before each h2Adam Spiers2019-01-061-0/+5
| |
| * update use casesAdam Spiers2019-01-061-8/+31
| |
| * add more details on caveatsAdam Spiers2019-01-061-12/+86
| |
| * add TOCAdam Spiers2019-01-061-0/+7
| |
| * fix link to licenseAdam Spiers2019-01-061-1/+1
|/
* Merge pull request #78 from aspiers/READMEAdam Spiers2018-10-211-7/+9
|\ | | | | minor tweaks to improve README
| * minor tweaks to improve READMEAdam Spiers2018-10-211-7/+9
|/ | | | Thanks to Ben North for some useful feedback.
* Merge pull request #76 from aspiers/merge-commitsAdam Spiers2018-10-041-2/+2
|\ | | | | ALGORITHM CHANGE: only diff tree with first parent
| * ALGORITHM CHANGE: only diff tree with first parentAdam Spiers2018-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running git deps on FOO^! is effectively answering the question "which commits would I need in order to be able to cleanly cherry-pick commit FOO?" Drilling down further, that could be rephrased more precisely as "which commits would I need in my current branch in order to be able to cleanly apply the diff which commit FOO applies to its parent?" However, in the case where FOO is a merge commit with multiple parents, typically the first parent P1 is the parent which is contained by the merge's target branch B1. That means that the merge commit FOO has the effect of applying the diff between P1's tree and the FOO's tree to P1. This could be expressed as: tree(P1) + diff(tree(P1), tree(FOO)) == tree(FOO) Therefore the question git-deps needs to answer when operating on a commit with multiple parents is "which commits would I need in my current branch in order to be able to cleanly apply diff(tree(P1), tree(FOO)) to it?" However, the current algorithm runs the blame analysis not only on diff(tree(P1), tree(FOO)), but on diff(tree(Px), tree(FOO)) for *every* parent. This is problematic, because for instance if the target branch contains commits which are not on P2's branch, then diff(tree(P2), tree(FOO)) will regress any changes provided by those commits. This will introduce extra dependencies which incorrectly answer the above question we are trying to answer. Therefore change the algorithm to only diff against the first parent. This is very similar in nature to the -m option of git cherry-pick: https://stackoverflow.com/questions/12626754/git-cherry-pick-syntax-and-merge-branches/12628579#12628579 In the future it may be desirable to add an analogous -m option to git-deps. Sem-Ver: api-break
* | Merge pull request #77 from aspiers/fixupsAdam Spiers2018-10-043-0/+79
|\ \ | |/ |/| add git-fixup and documentation for use case
| * add git-fixup and documentation for use caseAdam Spiers2018-10-033-0/+79
|/ | | | | This is a nice new use case for git-deps which makes it even easier to amend commits buried in the history.
* Merge remote-tracking branch 'github/master'Adam Spiers2018-09-283-18/+36
|\
| * add reminder about CLI usge help duplicationAdam Spiers2018-06-151-0/+3
| |
| * improve Usage section of READMEAdam Spiers2018-06-151-12/+33
| |
| * Docker-based installation is now fixedAdam Spiers2018-05-301-6/+0
| |
* | fix bug with -l when analyzing multiple commitsAdam Spiers2018-09-111-0/+3
| | | | | | | | | | If multiple commits depend on commit X, then the git log output for commit X will only be shown when the first one is discovered.
* | fix undefined parent variable bugAdam Spiers2018-09-111-4/+6
| | | | | | | | | | This was introduced by recent refactoring which split blame_hunk() into several smaller methods.
* | move more important debug to INFO levelAdam Spiers2018-09-111-14/+14
| | | | | | | | | | In the future, this will let us control the verbosity of the debug output.
* | clarify that the hunk gets listed later in the debugAdam Spiers2018-09-101-1/+1
| |
* | rename blame_hunk to blame_diff_hunkAdam Spiers2018-09-101-2/+2
| | | | | | | | This makes it a bit clearer where the hunk came from.
* | tweak indentation to make debug easier to followAdam Spiers2018-09-091-3/+3
| |
* | fix indentation when debugging hunksAdam Spiers2018-09-091-1/+1
| |
generated by cgit (git 2.34.1) at 2024-11-09 01:28:08 +0000