Commits

Commit:
5e5da8c4bcc83f7737a115b8da52fc3935fe3a6b
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
77d7d3bb1aabafae6c020c8a07a6e9f4f7885c9b
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
d65a88a2f0db40d2c2ac34ee34e8aff8ac629d52
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
indentation fixes
diff | patch | tree
Commit:
e33e440b685fac5ee693a2d2072d865d36352e89
From:
Stefan Sperling <stsp@stsp.name>
Date:
whitespace fix
diff | patch | tree
Commit:
bd3d9e54cb422cb58d52b267c6a8afc3376842d2
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
f024663dea0dea05a0d4c17d2314f38f73e85bc6
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
f3bc9f1df29f91c63ed334a1a9c8929209f93fdc
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
tog: when jumping to the bottom of the log view, go from the tail backwards ok jasper
diff | patch | tree
Commit:
978a28a108ecdc501cf03dade3215aed24981a12
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
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
Commit:
ea66598afcb6fd0bfa2c6cad9532450223c85054
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
tog: jump directly to first log item instead of traversing the list ok tracey
diff | patch | tree
Commit:
e4526bf56efa8d234d206abac903deccceed4f17
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
tog: add support for navigating to first/last line of tree and ref views ok stsp
diff | patch | tree
Commit:
376d7c6217310146ba605e4994521c6fde62fc18
From:
Stefan Sperling <stsp@stsp.name>
Date:
bump version number
diff | patch | tree
Commit:
49213cad8cad44e38cd6a8da2595657b3dc11077
From:
Stefan Sperling <stsp@stsp.name>
Date:
changes for 0.57
diff | patch | tree
Commit:
eca70f98448556db333b7c61d37122488b572422
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
0baddd91502bcd7aca9f72f5ded3609326c953cf
From:
Stefan Sperling <stsp@stsp.name>
Date:
add test which covers a cherrypick merge from a branch to itself
diff | patch | tree
Commit:
ed99f061b0cece8bf32baf31bd5e6b9e39509127
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test case which covers 'got cherrypick' in a mixed-commit work tree
diff | patch | tree
Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278
From:
Stefan Sperling <stsp@stsp.name>
Date:
limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy
diff | patch | tree
Commit:
6435d2a6d2c84c4875a0c6f641b06d7cd1796a0c
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
sys/param.h is not needed
diff | patch | tree
Commit:
5546d4669ccce281a6f6f89ccf204e671ed0d3a9
From:
Stefan Sperling <stsp@stsp.name>
Date:
plug a memory leak in check_merge_ok()
diff | patch | tree
Commit:
a16d97bdc65b49050d622450d50642fa98eb3cc1
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
243a13f59c19fd9761211d200b68b77f99f6aded
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix bogus error when 'got cherrypick' merges changes into a locally added file reported by + ok naddy
diff | patch | tree
Commit:
4deef56fe9fdbfef7d2ecd12947ff515a0daae78
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
tog: add support for navigating to first/last line of blame view ok tracey stsp
diff | patch | tree
Commit:
6c13b00592a6253b4a4de885b1f595e141b65281
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
dae2a678dfc5685c0f121fd205f62439f417dcc5
From:
Stefan Sperling <stsp@stsp.name>
Date:
backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all
diff | patch | tree
Commit:
0e33f8e0becf732ab33b3ce78c026790a651a5f9
From:
Stefan Sperling <stsp@stsp.name>
Date:
disable ignore lists during status walks used by rebase and histedit Fixes rebase of gotwebd branch which added a new directory which is also matched by .gitignore rules on the branch.
diff | patch | tree