Commit Briefs

2e60146439 Stefan Sperling

fix regress/fetch build; broken by my renaming of got_fetch_parse_uri()

diff | patch | tree

c10270f60d Christian Weisgerber

assert against accidentally overflowing argv[] in got_dial_ssh()

ok stsp

diff | patch | tree

5e5da8c4bc Stefan Sperling

rename got_fetch_parse_uri() to got_dial_parse_uri()

This function is now being used by both 'got fetch' and 'got send' so its former name was misleading.

diff | patch | tree

77d7d3bb1a Stefan Sperling

de-duplicate a constant used by both 'got fetch' and 'got send'

Both GOT_FETCH_PKTMAX and GOT_SEND_PKTMAX had the same value. Declare this value as GOT_PKT_MAX in got_lib_pkt.h instead.

diff | patch | tree

d65a88a2f0 Stefan Sperling

move duplicated dial_ssh() and dial_git() functions into a common file

These functions are used by 'got send' and 'got fetch' in order to open network connections to a server. Move them into new file lib/dial.c and declare relevant functions in got_dial.h and lib/got_lib_dial.h. No functional change.

diff | patch | tree

abc59930d5 Christian Weisgerber

indentation fixes

diff | patch | tree

e33e440b68 Stefan Sperling

whitespace fix

diff | patch | tree

bd3d9e54cb Stefan Sperling

move more code used by got-send-pack and got-fetch-pack to a common file

Move functions and data structures which implement Git protocol features required for fetching and sending pack files to new files lib/gitproto.c and lib/got_lib_gitproto.h. This code was duplicated in got-fetch-pack and got-send-pack. No functional change.

diff | patch | tree

f024663dea Stefan Sperling

move pkt code used by got-fetch-pack and got-send-pack to a common file

The Git protocol uses a simple packet framing format. The got-fetch-pack and got-send-pack programs contained identical copies of functions to support this format. Move related functions to new file lib/pkt.c and link both programs against this common implementation. No functional change.

diff | patch | tree

f3bc9f1df2 Christian Weisgerber

tog: when jumping to the bottom of the log view, go from the tail backwards

ok jasper

diff | patch | tree

978a28a108 Christian Weisgerber

make "got branch -d" print reference name and value

Also silence output of "got branch -d" in a regression test, from stsp. ok stsp

diff | patch | tree

ea66598afc Christian Weisgerber

tog: jump directly to first log item instead of traversing the list

ok tracey

diff | patch | tree

e4526bf56e Christian Weisgerber

tog: add support for navigating to first/last line of tree and ref views

ok stsp

diff | patch | tree

376d7c6217 Stefan Sperling

bump version number

diff | patch | tree

49213cad8c Stefan Sperling

changes for 0.57 (tags/0.57)

diff | patch | tree

eca70f9844 Stefan Sperling

fix 'got send' adding too many objects to the pack file in some cases

Load server-side tags before loading local commits. Otherwise objects which are reachable via server-side tags will not be filtered out.

diff | patch | tree

0baddd9150 Stefan Sperling

add test which covers a cherrypick merge from a branch to itself

diff | patch | tree

ed99f061b0 Stefan Sperling

add a test case which covers 'got cherrypick' in a mixed-commit work tree

diff | patch | tree

69de9dd421 Stefan Sperling

limit checks for merge conflicts to files affected by the merge

Performance problems reported by naddy

diff | patch | tree

6435d2a6d2 Christian Weisgerber

sys/param.h is not needed

diff | patch | tree

5546d4669c Stefan Sperling

plug a memory leak in check_merge_ok()

diff | patch | tree

a16d97bdc6 Stefan Sperling

remove ancestry sanity checks from 'got cherrypick' and 'got backout'

While these checks might catch usage mistakes the performance overhead of scanning the entire history of the current branch is not worth it. Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's src repository in usr.bin/rsync: Before: 5m50.33s real 4m02.36s user 2m04.41s system After: 1m04.92s real 0m28.24s user 0m36.54s system Further performance improvements could be needed but this is a first step.

diff | patch | tree

243a13f59c Stefan Sperling

fix bogus error when 'got cherrypick' merges changes into a locally added file

reported by + ok naddy

diff | patch | tree

4deef56fe9 Christian Weisgerber

tog: add support for navigating to first/last line of blame view

ok tracey stsp

diff | patch | tree

6c13b00592 Stefan Sperling

Update comment regarding the merged_paths list used by rebase and histedit

with insight I obtained while trying to make this idea work, and failing...

diff | patch | tree