Commits
- Commit:
4b752015b5208a96c2d1b6c1c6b8589884b8b2b6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch 'tog diff' and 'tog blame' to Myers diff for speed
Make the choice of diff algorithm configurable by diff API users.
The got and gotweb programs keep using Patience diffs which are
prettier than Myers. But tog should be as fast as possible since
it is being used interactively. If performance of Patience diff
gets improved later we can consider switching tog back over to it.
ok tracey jamsek
- Commit:
49d4a01751d39b078bfb27a2d63b5cfa69e410fd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move more opentemp out of diffreg.c
ok tracey
- Commit:
e6e73e5504113b6c75f1b2e3dec3e22af8f41996
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move remaining got_opentemp's out of blame. ok op@
- Commit:
8c4a6db8547e314f29117f820ab5f99722b980fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make it possible to show just one tag with 'got tag -l'
suggested by jrick
ok jrick jamsek
- Commit:
f9d376997dd2e84bf84c3c9a4da842d1b5565e9d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move got_opentempfd() out of lib/diff.c again
ok tracey
- Commit:
1b484788fec38ce9936267c176e77f653d749b8d
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of blame_open ok stsp@ jrick@
- Commit:
eb81bc23c735e8aa9eaee796a230c7d7c76657ba
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
8469d82143a591d423c000c47c63bababe6f5716
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- Commit:
336075a42a5ae0fa322db734c481d21998e82bb8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
build with -Wmissing-prototypes
ok stsp@
- Commit:
61bce19e6ae4329fe5f0a05d33b7bd1510718852
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
revert "clear the rest of the pack_fds pointers"
There is no need to clear local variables before returning from a function.
ok tracey
- Commit:
bb1c2cf3c90225c5f234ac42f3507b6e1839da5d
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
clear the rest of the pack_fds pointers
- Commit:
0ae84acc1f0a0584e4f26ccbe029c895043b3abe
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of got_repo_open. ok stsp@
thanks for all the help massaging this diff
- Commit:
85c34e74e98435d0ebb99360b18587411a652741
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix error case handling in print_commit_oneline(); pointed out by op@
- Commit:
d91e053539d7b792ea587fe510d514642396db55
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got log -s show committer date
ok op@
- Commit:
4cac2b4e3f60c45b2a6550d4b15730d172eab925
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got log -s display local reference names
ok op@
- Commit:
793b939450f25c2e96cd312e618683f2517c7058
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got log: sync match_commit from tog
So that 'got log -S' can match also the author and committer name, and
the commit ID too.
ok stsp@
- Commit:
a558dd1be5714d8e7a83f7d63180550e86ccae5c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reuse a temporary file across commits during got log -p -S
suggested by + ok op@
- Commit:
ee0fb1ff2261d82ca1d25edbb6db0359b589779d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make it possible to match committed patches with got log -p -S pattern
ok op@
- Commit:
90e25b1fb888319a60c666995286e204ed5fe0ae
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug a memory leak in show_change(), line was leaked
- Commit:
c1c775ebf431921ec88711e07b197edd07e05bb5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add one-line output mode to got log with -s flag
-s for short. Moves log search to -S.
Patch by Evan Silberman
- Commit:
b72706c3d172544098fcd24fd639374694a8fce9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move creation of tempfiles outside of lib/diff.c
ok tracey
- Commit:
571608344a37fb96f46850a1124415ab68b1a431
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
open temporary files needed for delta application in got_repo_open()
This prepares for callers of got_repo_open() that cannot afford to
open files in /tmp, such as gotwebd. In a follow-up change, we could
ask such callers to pass in the required amount of open temporary files.
One consequence is that got_repo_open() now requires the "cpath" pledge
promise. Add the "cpath" promise to affected callers and remove it once
the repository has been opened.
ok tracey
- Commit:
bad961bf76d36ad6f3472c7ad80f648091f56019
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: allow to reverse a patch
add a flag to got_patch to reverse a patch before applying and the -R
flag for `got patch'.
ok stsp@
- Commit:
8618727816209ecdebf5df08c8d51556922f5398
- From:
- Omar Polo <op@omarpolo.com>
- Date:
mention -p in usage_patch
- Commit:
d7b5a0e827bb38e5c8502f0ba8d7838fedaba19b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@