repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-svn: factor out svnserve test code for later use
2007-05-19
Simon Haus
m
a
n
n
More clea
n
ups
and speedups
for l
a
b
els
a
nd branc
h
es
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausm
a
n
n
Cleanu
p
/spee
d
up th
e
branch<> file
s
pli
t
and remo
v
ed
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
More w
o
rk on
the i
n
creme
n
tal
importing
of mult
i
ple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon Hausmann
Give br
a
nches a nice project prefix and don
'
t bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausma
n
n
St
a
rted rewriting the branch de
t
e
c
t
ion, based on "p
4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon H
a
us
m
a
n
n
R
emove
d
unused ca
c
he var
i
able
s
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Fix bran
c
h
s
e
tup af
t
er initial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon
H
ausmann
Re
m
oved todo item that is impleme
n
ted :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Ha
u
smann
Added supp
o
rt
for
git-p4 sync/rebase
--with-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Ha
u
smann
Bite the bull
e
t a
n
d automatically convert old s
t
yle
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Changed the de
f
ault p4
impor
t
branch
t
o be refs/
r
emo
t
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausmann
C
r
eate the origin b
a
s
e
d i
m
p
ort branch us
i
ng git update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Removed
an
c
ie
n
t and unused
c
o
de to f
i
nd t
h
e last impo
r
te
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon H
a
usmann
R
em
o
ved cleanta
g
s
comma
n
d
.
It do
e
sn't h
a
v
e any
m
e
a
ning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
C
l
ean up code duplication for revision parsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon H
a
usmann
Always
pass a sha1
f
or the ini
t
ial
pa
r
ent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausm
a
nn
Fi
x
ing syncing (
g
itd
i
r discovery / cd) for bare repo
s
itories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A lit
t
le
t
o
d
o no
t
e
b
efo
r
e I for
g
et it
:), based o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausm
a
nn
Fix c
a
llin
g
git
-
p4 re
b
a
se from
w
ithin a sub
d
irectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on Hausmann
Give a
b
etter hint
i
f
git-p4 submit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added the
p
ossib
i
l
i
ty of skipping
patc
h
es during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
au
s
mann
Make git-
p
4 work with
b
ar
e
repo
s
it
o
ries
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
u
smann
F
i
x git
-
p4 clone //
d
epot/pro
j
ect
(
head
i
mport)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
n
n
Co
n
verted to unix newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Ma
k
e submitting work o
n
Win
d
ows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
M
ake sure all popen calls use binary mode
(for Wi
n
dows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Add
e
d a little
.
ba
t
wrapper fr
o
m Mariu
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausm
a
n
n
Use the
subprocess module instead o
f
popen2
to m
a
k
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Haus
m
ann
Document
some
i
mp
l
emen
t
ati
o
n detail
s
, for the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausmann
C
l
e
a
n
up, removed
t
he old tagging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Haus
m
ann
cleanup,
renamed
se
l
f
.
gl
o
ba
l
Prefix to s
e
l
f
.
depotPa
t
h
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausmann
M
icro cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
u
s
m
a
nn
D
o
c
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Haus
m
ann
Handle patch errors in git-p4 submit b
e
tter
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon
H
aus
m
ann
A
new attempt at fixing the child-fast-impo
r
t-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on Hausmann
Slightly i
m
proved forma
t
ting of the
r
aw_input
q
uestions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Re
m
oved th
e
old patch a
p
ply co
d
e
from git-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
F
ix the t
i
mez
o
ne formatting
.
N
o
w qgit
also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Sim
o
n Ha
u
sma
n
n
Pr
i
nt
a
n error message of some sort if
g
it fast-
i
m
po
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
Allow
f
o
r
c
o
nvenient rebasing after g
i
t-
p
4
s
ub
m
i
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
H
a
u
smann
Add
e
d
a
s
i
mp
l
e e
x
am
p
le of
u
sa
g
e to th
e
"document
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
m
o
n
H
ausm
a
n
n
fix
v
ariable usage
(oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausmann
Fix file determinati
o
n for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Ha
u
smann
A
d
d
ed g
i
t-p4 clon
e
convenie
n
ce co
m
mand
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n Hausmann
H
onor -
-
silent for
l
abels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Turn off potenti
a
lly s
l
ow label detecti
o
n by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
ann
Provide a
t
ree summary after git-
p
4 re
b
ase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausma
n
n
Added git-p4 r
e
base
con
v
enience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon H
a
usmann
Cle
a
n u
p
python cla
s
s nam
e
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
imon
H
aus
m
ann
Fix "compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
S
imon
Hausmann
Fix the do
c
s fo
r
git-
p
4
s
u
bmit and
turn
g
it
-
p4
s
ubmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Si
m
on Hausmann
Fix v
a
riabl
e
usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausman
n
Added suppo
r
t
for ma
p
ping p
4
labels
t
o git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git-p4 debug d
o
esn't need a git
repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Sim
o
n Hau
s
mann
D
o
n
'
t try to pars
e
any
option
s
with gi
t
-p4 debug
b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausmann
Pref
e
r g
i
t command over
g
it-c
o
mmand
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausmann
M
inor cosme
t
ic fix
l
et
for the git-p4 submit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausmann
Different v
e
rsio
n
s of p4 h
a
ve different output
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hau
s
mann
Use th
e
new in
c
remental import style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simo
n
H
a
u
s
man
n
Make
i
t possible to run
g
i
t-p
4
submit fr
o
m within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hausmann
B
r
and new smart incremental imp
o
rt tha
t
doesn
'
t need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
Hausmann
Set the de
f
ault branc
h
in run, not in th
e
constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
Hau
s
mann
H
elper funct
i
on
to c
h
eck the existance
of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Ha
u
s
mann
Adde
d
some helper
function(s) to parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Changed the default
branch for imports from
"master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n Hausmann
Changed the
form
a
t
of t
h
e im
p
or
t
ed log messa
g
e slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausma
n
n
Re
m
oved the
.
py extension
from git-p4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
Don't show the
s
ubmit te
m
plat
e
and
t
h
e diff fi
r
st
in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hausmann
Ma
k
e it
p
os
s
ibl
e
to invoke gi
t
-p4 from with
i
n subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon H
a
usmann
Made
-
-
a
p
p
l
y-as-patch
t
he defa
u
lt for git-
p
4
subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Fix sup
p
ort for dele
t
ions in
gi
t
-p4 su
b
mit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
au
s
ma
n
n
Added experimental
but
s
u
per-
f
ast --apply-as-p
a
tch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hausmann
Docume
n
tatio
n
e
n
hancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Ha
u
smann
S
tart o
f
the
git-
p
4 d
o
c
u
m
en
t
ation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
a
us
m
ann
Remov
e
d p4-fast-export and p
4
-git
-
sync as they
'
ve
b
e
en
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
F
ixe
d
the
initial ve
r
sion import
b
y gett
i
ng the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Added missing
"self"s to
make the
sc
r
ipt
e
valuate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hausmann
Co
m
p
letel
y
untested "merge" of p4-f
a
st-export
.
p
y into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
n
n
s
y
nc-to-perforce
is no
w
called
s
ubmit and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Pa
r
t of the c
o
de is c
o
pyr
i
ght by Tr
o
lltech AS
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Ha
u
smann
First (untested) attempt at
migr
a
ting p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
P
r
ovi
d
e
a lit
t
le bit of help d
e
scriptio
n
fo
r
the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start moving the git-p4 tools into one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Pass the right number
of argum
e
nts to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved th
e
git d
i
r
detectio
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Haus
m
ann
Default
t
o in
t
eractive synci
n
g
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
Use
p4 reve
r
t
.
.
.
instead of revert -
a
.
.
.
after s
u
b
mittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n Hausmann
Auto-
d
e
te
c
t th
e
current git branch b
e
f
ore submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Ha
u
smann
Ig
n
ore Apple
r
esource
f
iles when importi
n
g fr
o
m perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausman
n
Be nice and use /usr/b
i
n/env pyth
o
n
for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
man
n
Autom
a
tically operate on a temporar
y
branch
,
needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on
H
ausmann
Lot
s
of b
u
gfi
x
es to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausm
a
nn
Fix git-dir
option
and allow readi
n
g
l
og su
b
stitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Haus
m
ann
Fi
r
st version of
a n
e
w scri
p
t to submit changes
back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Split up the
cache
c
ommandli
n
e options into (c
o
mmand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Ha
u
s
m
ann
Reduce
t
he
number of false "merges
"
by skipping "branc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
aus
m
ann
M
o
re work on branch detection by implementing c
h
angeIsBran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More c
o
d
e
cleanups and prepar
a
tions f
o
r more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor co
d
e cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon Hausmann
Make the p4 data/command c
a
che con
f
igurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next