repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-ort: implement compute_collisions()
2021-01-21
Elija
h
N
e
wren
m
erge-ort: imp
l
e
m
ent
c
ompute_collisions()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newre
n
merge-ort: modify collect_renam
e
s() for
d
irec
t
ory renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newre
n
m
e
rge-ort: implement
han
d
le_directory_l
e
vel_c
o
n
f
lic
t
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elij
a
h
Newr
e
n
m
erge-o
r
t: implement compute_
r
e
n
a
m
e_counts
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Ne
w
re
n
me
r
g
e
-
ort: copy get_renamed_dir_portion() fr
o
m merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elija
h
Newren
m
e
rge-ort: add outline of ge
t
_provisional_directory_renames(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah N
e
wren
me
r
ge
-
ort
:
add outline for compu
t
ing d
i
rectory re
n
ames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah New
r
en
me
r
ge-ort: collect whi
c
h
d
irectories a
r
e removed in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newren
merge-ort: ini
t
ial
i
ze an
d
free new dir
e
ctory re
n
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
El
i
jah Newren
merge-ort: add new data structures for director
y
r
e
n
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Eli
j
ah New
r
e
n
merge-o
r
t: im
p
lement merge_in
c
ore_re
c
u
r
si
v
e()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Ne
w
re
n
mer
g
e
-ort: make clear_inte
r
nal_opts()
a
ware of partia
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
E
l
ijah Newren
merge-ort: cop
y
a few smal
l
hel
p
e
r
f
unctions from merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
c
ommit: move reverse_commit
_
li
s
t() fro
m
m
erge-recursiv
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Eli
j
ah
N
ew
r
en
merge-ort: add implementation of typ
e
-changed re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
E
l
i
jah N
e
wre
n
merge-ort: ad
d
implementation of normal rena
m
e h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah N
e
wren
merge-ort: ad
d
implement
a
tion of re
n
ame co
l
lisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge-
o
r
t: add implementation of rename
/
delete
con
f
lict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge-o
r
t: ad
d
i
mplementati
o
n
of
b
oth sides renami
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah New
r
e
n
merge-ort: add implementat
i
on o
f
bo
t
h sid
e
s re
n
aming
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
lijah Newren
merge-o
r
t: a
d
d
basic outl
i
n
e
for proce
s
s_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Newren
merge-ort: impleme
n
t compare_pairs() and c
o
llect_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
merge-ort: implement d
e
tect_regular_rena
m
es()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elij
a
h
Newr
e
n
merg
e
-or
t
: add init
i
al outline f
o
r basic
rename
detect
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newr
e
n
merge-ort:
add
basic dat
a
str
u
ctur
e
s f
o
r handling r
e
n
a
m
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
m
e
rge-ort: add
m
odify/de
l
ete handling
a
n
d delayed outp
u
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ija
h
N
ew
r
e
n
merge-or
t
: add die-
n
o
t
-implement
e
d
stub handle_content_me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
merge-ort: add function
g
rouping comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
m
e
rge-ort: a
d
d a
p
aths_to_free fiel
d
t
o m
e
rg
e
_option
s
_in
t
ernal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Ne
w
ren
m
e
rge-or
t
:
add
a
p
ath_conflict field to merge_o
p
tions_internal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
a
h
N
ewre
n
merge-ort:
add a clear_int
e
r
n
al_opts helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newre
n
merge-ort: ad
d
a few
includes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
m
erge-or
t
:
f
re
e
data
structure
s
in merge_fina
l
ize()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah
N
e
wren
merge-ort: add implementa
t
ion of record_conf
l
icted_index_ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
j
a
h Newr
e
n
tree: enable cmp_cache_
n
ame_compare() to be used elsewhere
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
w
ren
merge
-
o
r
t: add
implementation of checkout()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: basic ou
t
l
i
ne for me
r
ge_sw
i
t
ch_to_
r
e
s
ult()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
mer
g
e-ort
:
st
e
p
3 of tree writ
i
ng -
-
h
a
n
d
ling subdi
r
ecto
r
ies
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
merge-ort: st
e
p 2 of
t
r
e
e
writing -- function
t
o
c
reate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-ort:
s
tep 1 of
tr
e
e writ
i
ng
-- record basenames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewr
e
n
merge-o
r
t: have
process
_
entries operate
in a defi
n
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newre
n
m
e
rge-ort:
a
dd a
p
relimina
r
y
simple pro
c
es
s
_
e
ntries
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
e
wren
merge-ort: avoid recurs
i
ng into id
e
ntical trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Ne
w
ren
m
erge-ort: r
e
cord stage a
n
d auxiliary in
f
o f
o
r e
v
ery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
mer
g
e
-
or
t
:
co
m
pute
a few more usefu
l
fields for col
l
ec
t
_merg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah
Newren
merge-ort: avoid repeating fill_tre
e
_de
s
c
riptor()
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
erge-ort:
i
mplement a very basic col
l
ect_merge_i
n
fo()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add an err() fu
n
ction similar to one from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-or
t
:
u
se
h
istog
r
am diff
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h New
r
en
me
r
ge
-
or
t
: port merge_start() from mer
g
e-recursive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge
-
o
r
t: add some high-level alg
o
rit
h
m structure
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newr
e
n
merge-ort: setup basic
intern
a
l data structures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Eli
j
ah Newren
shor
t
lo
g
: use str
s
et
from strmap
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
Use
n
ew HASHMAP_INIT macro t
o
s
i
mplify hashmap
i
nitialization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah N
e
wr
e
n
s
trmap: take advantage of FLEXPTR_ALLO
C
_STR
w
h
en
relevant
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Ne
w
ren
strmap: enab
l
e allocati
o
ns to
come
f
rom a mem_pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
E
l
i
jah N
e
w
r
en
s
trmap: ad
d
a strse
t
su
b
-type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elija
h
N
ewren
strmap: split crea
t
e_entry() out
o
f strmap
_
put
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newr
e
n
s
trmap: ad
d
function
s
facilit
a
ting
u
s
e
as a string
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah
Ne
w
r
e
n
str
m
ap: enable faster cle
a
ring and reusing of strmaps
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
E
l
ijah Newr
e
n
strmap: add
m
ore utilit
y
functions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-03
Elijah New
r
en
merge
,
rebase,revert: select ort or recursive by config
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
strmap: new uti
l
i
ty functio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
E
l
i
j
ah Newren
h
ash
m
ap: p
r
o
v
i
d
e
dea
l
location funct
i
o
n names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Ne
w
ren
hashmap
:
intr
o
duce a new hashm
a
p
_
partial_cl
e
a
r
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Ne
w
ren
hashmap
:
allo
w
re-u
s
e after hashmap_
f
re
e
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elija
h
Newren
h
a
shmap: a
d
ju
s
t s
p
acin
g
t
o fix argume
n
t alignment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-29
E
l
ijah N
e
wren
fast-rebase: demonstrate me
r
ge-
o
rt's API v
i
a
new t
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newre
n
m
erge
-
ort-wra
p
pers:
n
ew convience w
r
appers to m
i
mic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-27
E
l
ij
a
h Newren
merg
e
-ort: bar
e
bones API of new
m
erge strategy with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
E
l
ijah Newren
t
6
423: add more details about dir
e
c
t reso
l
ution of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Elijah Newren
t64
2
3:
no
t
e improved
o
r
t hand
l
ing with un
t
ra
c
ke
d
files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
E
lijah New
r
e
n
t6423,
t64
3
6
:
note improved
ort handl
i
n
g with dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
El
i
jah Newren
m
erge tests: expect sl
i
ght differences in
output for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
E
lijah Newren
t6
4
23: expect
improve
d
conflict markers lab
e
ls in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Elijah New
r
e
n
t6404, t6423: expect im
p
roved
r
ename/delete handlin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Elij
a
h Newre
n
t6416: correct expecta
t
ion for ren
a
me/rename(1t
o
2)
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Elijah Newren
me
r
g
e
tests: ex
p
ect i
m
proved
d
irec
t
ory
/
fil
e
co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Eli
j
ah Newren
t/: new helper for tests th
a
t pass with ort but fail
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-21
E
l
ijah Newren
s
equenc
e
r: remove
dup
l
icate rollba
c
k_l
o
ck_file() call
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-18
Elijah Newre
n
t
e
st-l
i
b:
re
d
uc
e
verbosi
t
y of skipped te
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-18
Elijah N
e
wren
t600
6
,
t601
2
:
a
dj
u
st tests
t
o use
'
setup' instead o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-18
Elijah
Newre
n
t
e
st-l
i
b: allow
selecting tests by substring/glob w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-18
Elijah Newren
t
7
518: fix f
l
a
ky grep invocation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-16
E
l
ijah Newren
t6423:
m
ore
i
n
volv
e
d
rul
e
s for renaming dir
e
ctories
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-16
E
l
ijah Newren
t6423: update directo
r
y renam
e
d
e
te
c
tion test
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-16
Elijah Newren
t6423: more i
n
vol
v
e
d directory renam
e
te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-16
El
i
jah
N
ewren
d
i
rector
y
-rename-detect
i
on
.
t
xt: u
p
date references to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-13
Elijah Newre
n
hashmap: add
u
sa
g
e documentation explaining
h
ashmap
_
free
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-19
E
lij
a
h Newren
dir: fix pro
b
le
m
atic API
t
o a
v
oid memory lea
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-19
Elijah New
r
en
dir: make cl
e
ar
_
d
i
rectory(
)
fr
e
e all re
l
eva
n
t m
e
mo
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
E
lijah
N
e
wren
mem-p
o
ol:
use
consistent pool variable name
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
El
i
j
ah Newren
mem-
p
ool: us
e
more standard initi
a
liz
a
t
i
on and final
i
zation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
Elijah New
r
en
m
e
m-po
o
l:
a
d
d convenien
c
e
f
unctions
f
or strd
u
p
a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-14
Elijah
N
ewren
sequencer
:
av
o
id ga
r
bl
e
d merge ma
c
hinery messages due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-12
Elijah
Newren
dir: avo
i
d prematurely marking
n
onba
r
e repositories
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-12
E
l
ija
h
N
e
w
ren
t3000: fix some t
e
st des
c
ription
t
y
p
os
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah N
e
wren
t64
2
5: b
e
mo
r
e
f
l
e
x
ible with rename/d
e
lete
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t
6
4
2[23]: be more flexible fo
r
add/add
c
onflic
t
s
i
nvolv
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah
Newr
e
n
t64
2
2
, t
6
426: b
e
more flexible for add
/
add
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next